forked from mysql/mysql-server
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge '7.4' into mysql-trunk-cluster
- fix conflicts in copyright headers - replace Sql_condition::WARN_LEVEL_WARN with Sql_condition::SL_WARNING - replace usage of pthread_ with native_ - Add SHOW_SCOPE_GLOBAL to new(or refactored) status variables Conflicts: .gitignore VERSION mysql-test/collections/default.experimental mysql-test/suite/ndb/r/ndb_alter_table_online.result mysql-test/suite/ndb/r/ndb_alter_table_online2.result mysql-test/suite/ndb/r/ndb_types.result mysql-test/suite/ndb/t/ndb_types.test mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result mysql-test/suite/ndb_binlog/r/ndb_binlog_discover_multi.result mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result mysql-test/suite/ndb_binlog/t/ndb_binlog_discover.test mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_ext.result mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans_ext.result mysql-test/suite/ndb_rpl/t/ndb_conflict_info.inc mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.inc mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.inc mysql-test/suite/ndb_rpl/t/ndb_trans_conflict_info.inc mysql-test/suite/ndb_rpl/t/ndb_trans_conflict_info_stable.inc mysql-test/suite/rpl/r/rpl_4threads_deadlock.result mysql-test/suite/rpl/t/rpl_4threads_deadlock.test packaging/rpm-oel/mysql.spec.in scripts/mysql_system_tables.sql sql/ha_ndb_ddl_fk.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_binlog.h sql/sql_show.h storage/ndb/CMakeLists.txt storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryImpl.java storage/ndb/include/kernel/GlobalSignalNumbers.h storage/ndb/include/kernel/ndb_limits.h storage/ndb/include/mgmapi/mgmapi_config_parameters.h storage/ndb/include/ndbapi/NdbDictionary.hpp storage/ndb/include/transporter/TransporterCallback.hpp storage/ndb/include/transporter/TransporterRegistry.hpp storage/ndb/src/common/debugger/signaldata/CMakeLists.txt storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp storage/ndb/src/common/debugger/signaldata/SignalNames.cpp storage/ndb/src/common/portlib/NdbCondition.c storage/ndb/src/common/transporter/TransporterRegistry.cpp storage/ndb/src/kernel/blocks/ERROR_codes.txt storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp storage/ndb/src/kernel/blocks/lgman.cpp storage/ndb/src/kernel/blocks/tsman.cpp storage/ndb/src/kernel/error/ErrorReporter.cpp storage/ndb/src/kernel/vm/DLHashTable.hpp storage/ndb/src/kernel/vm/mt.cpp storage/ndb/src/mgmsrv/MgmtSrvr.hpp storage/ndb/src/mgmsrv/Services.cpp storage/ndb/src/ndbapi/ClusterMgr.cpp storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp storage/ndb/src/ndbapi/NdbScanOperation.cpp storage/ndb/src/ndbapi/TransporterFacade.hpp storage/ndb/src/ndbapi/WakeupHandler.cpp storage/ndb/src/ndbapi/trp_buffer.hpp storage/ndb/src/ndbapi/trp_client.hpp storage/ndb/test/ndbapi/testBasic.cpp storage/ndb/test/ndbapi/testIndex.cpp storage/ndb/test/ndbapi/testLimits.cpp storage/ndb/test/ndbapi/testNdbApi.cpp storage/ndb/test/src/HugoTransactions.cpp storage/ndb/tools/ndb_dist_priv.sql support-files/mysql.spec.sh
- Loading branch information
Showing
587 changed files
with
51,981 additions
and
14,663 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
MYSQL_VERSION_MAJOR=5 | ||
MYSQL_VERSION_MINOR=7 | ||
MYSQL_VERSION_PATCH=6 | ||
MYSQL_VERSION_EXTRA=-ndb-7.4.0 | ||
MYSQL_VERSION_EXTRA=-ndb-7.4.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
--perl | ||
use strict; | ||
use lib "lib/"; | ||
use My::Find; | ||
use File::Basename; | ||
|
||
my $mysql_test_dir = $ENV{MYSQL_TEST_DIR} or die "Need MYSQL_TEST_DIR"; | ||
my $basedir = dirname($mysql_test_dir); | ||
|
||
# In the RPM case, binaries and libraries are installed in the | ||
# default system locations, instead of having our own private base | ||
# directory. And we install "usr/share/mysql-test". Moving up two | ||
# more directory relative to "mysql-test" gives us a usable base | ||
# directory for RPM installs. | ||
if (! -d "$basedir/sql" and ! -d "$basedir/bin" ) | ||
{ | ||
$basedir= dirname($basedir); | ||
} | ||
my $bindir = $ENV{MTR_BINDIR} || $basedir; # Out of source set MTR_BINDIR | ||
|
||
my $NDB_INDEX_STAT = my_find_bin($bindir, | ||
["storage/ndb/tools", "bin"], | ||
"ndb_index_stat"); | ||
|
||
my $vardir = $ENV{MYSQLTEST_VARDIR} or die "Need MYSQLTEST_VARDIR" ; | ||
open ( OUTPUT, ">$vardir/tmp/ndb_find_index_stat_tool_result.inc") ; | ||
print OUTPUT "let \$NDB_INDEX_STAT=$NDB_INDEX_STAT;\n"; | ||
close (OUTPUT); | ||
EOF | ||
|
||
--source $MYSQLTEST_VARDIR/tmp/ndb_find_index_stat_tool_result.inc | ||
--remove_file $MYSQLTEST_VARDIR/tmp/ndb_find_index_stat_tool_result.inc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
--perl | ||
use strict; | ||
use lib "lib/"; | ||
use My::Find; | ||
use File::Basename; | ||
|
||
my $mysql_test_dir = $ENV{MYSQL_TEST_DIR} or die "Need MYSQL_TEST_DIR"; | ||
my $basedir = dirname($mysql_test_dir); | ||
|
||
# In the RPM case, binaries and libraries are installed in the | ||
# default system locations, instead of having our own private base | ||
# directory. And we install "usr/share/mysql-test". Moving up two | ||
# more directory relative to "mysql-test" gives us a usable base | ||
# directory for RPM installs. | ||
if (! -d "$basedir/sql" and ! -d "$basedir/bin" ) | ||
{ | ||
$basedir= dirname($basedir); | ||
} | ||
my $bindir = $ENV{MTR_BINDIR} || $basedir; # Out of source set MTR_BINDIR | ||
|
||
my $NDB_PRINT_FILE = my_find_bin($bindir, | ||
["storage/ndb/src/kernel/blocks", "bin"], | ||
"ndb_print_file"); | ||
|
||
my $vardir = $ENV{MYSQLTEST_VARDIR} or die "Need MYSQLTEST_VARDIR" ; | ||
open ( OUTPUT, ">$vardir/tmp/ndb_find_print_file_tool_result.inc") ; | ||
print OUTPUT "let \$NDB_PRINT_FILE=$NDB_PRINT_FILE;\n"; | ||
close (OUTPUT); | ||
EOF | ||
|
||
--source $MYSQLTEST_VARDIR/tmp/ndb_find_print_file_tool_result.inc | ||
--remove_file $MYSQLTEST_VARDIR/tmp/ndb_find_print_file_tool_result.inc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
create table t1 ( | ||
a int, | ||
b int not null, | ||
c1 char(255), | ||
c2 char(255), | ||
key k1(b, c1, c2) | ||
) | ||
engine = ndb; | ||
insert into t1(a,b,c1,c2) values | ||
(0, 0, 0, 0), | ||
(1, 1, 1, 1), | ||
(2, 2, 2, 1), | ||
(3, 3, 3, 3), | ||
(4, 4, 4, 4), | ||
(5, 5, 5, 5), | ||
(6, 6, 6, 6), | ||
(7, 7, 7, 7), | ||
(8, 8, 8, 8), | ||
(9, 9, 9, 9); | ||
insert into t1 select a + 10, b, c1, c2 from t1; | ||
insert into t1 select a + 20, b, c1, c2 from t1; | ||
insert into t1 select a + 40, b, c1, c2 from t1; | ||
insert into t1 select a + 80, b, c1, c2 from t1; | ||
insert into t1 select a + 160, b, c1, c2 from t1; | ||
insert into t1 select a + 320, b, c1, c2 from t1; | ||
insert into t1 select a + 640, b, c1, c2 from t1; | ||
insert into t1 select a + 1280, b, c1, c2 from t1; | ||
explain | ||
select * from t1 as x, t1 as y | ||
where y.b = x.a and y.c1 = x.c1 and y.c2 = x.c1; | ||
id select_type table type possible_keys key key_len ref rows Extra | ||
1 SIMPLE x ALL NULL NULL NULL NULL 2560 Parent of 2 pushed join@1; Using where with pushed condition | ||
1 SIMPLE y ref k1 k1 516 test.x.a,test.x.c1,test.x.c1 10 Child of 'x' in pushed join@1 | ||
select count(*) from t1 as x, t1 as y | ||
where y.b = x.a and y.c1 = x.c1 and y.c2 = x.c1; | ||
count(*) | ||
2304 | ||
drop table t1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
select sum(high) < sum(total) from ndbinfo.ndb$pools | ||
where pool_name='Fired Trigger'; | ||
sum(high) < sum(total) | ||
1 | ||
create table num (n int); | ||
insert into num value (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); | ||
CREATE TABLE t1 ( | ||
a int NOT NULL, | ||
b int NOT NULL, | ||
c int NOT NULL, | ||
d int NOT NULL, | ||
PRIMARY KEY (`b`,`a`), | ||
unique key(d) | ||
) ENGINE=ndbcluster; | ||
insert into t1 select x1.n+x2.n*10+x3.n*100, 1, 1, 1+x1.n+x2.n*10+x3.n*100 from num as x1, num as x2, num as x3; | ||
ERROR HY000: Got temporary error 221 'Too many concurrently fired triggers (increase MaxNoOfFiredTriggers)' from NDBCLUSTER | ||
select sum(used) from ndbinfo.ndb$pools where pool_name='Fired Trigger'; | ||
sum(used) | ||
0 | ||
drop table num; | ||
drop table t1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.