3369 magnus.blaudd@stripped 2011-09-25 [merge]
Merge trunk-cluster -> trunk-cluster-merge
modified:
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
mysql-test/suite/innodb/r/innodb-index.result
mysql-test/suite/perfschema/r/pfs_upgrade.result
3368 magnus.blaudd@stripped 2011-09-23 [merge]
Merge trunk-cluster -> trunk-cluster-merge
modified:
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
sql/ha_ndbcluster_binlog.cc
sql/ha_ndbcluster_glue.h
storage/ndb/CMakeLists.txt
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result 2011-09-06 12:43:05 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result 2011-09-25 19:36:01 +0000
@@ -111,7 +111,7 @@ def mysql innodb_table_stats n_rows 4 NU
def mysql innodb_table_stats stats_timestamp 3 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL NULL NULL timestamp on update CURRENT_TIMESTAMP select,insert,update,references
def mysql innodb_table_stats sum_of_other_index_sizes 6 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned select,insert,update,references
def mysql innodb_table_stats table_name 2 NULL NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) PRI select,insert,update,references
-def mysql ndb_binlog_index deletes 6 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned select,insert,update,references
+def mysql ndb_binlog_index deletes 6 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references
def mysql ndb_binlog_index epoch 3 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned PRI select,insert,update,references
def mysql ndb_binlog_index File 2 NULL NO varchar 255 255 NULL NULL latin1 latin1_swedish_ci varchar(255) select,insert,update,references
def mysql ndb_binlog_index gci 10 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result 2011-09-06 12:43:05 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result 2011-09-25 19:36:01 +0000
@@ -111,13 +111,16 @@ def mysql innodb_table_stats n_rows 4 NU
def mysql innodb_table_stats stats_timestamp 3 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL NULL NULL timestamp on update CURRENT_TIMESTAMP
def mysql innodb_table_stats sum_of_other_index_sizes 6 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned
def mysql innodb_table_stats table_name 2 NULL NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) PRI
-def mysql ndb_binlog_index deletes 6 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned
+def mysql ndb_binlog_index deletes 6 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned
def mysql ndb_binlog_index epoch 3 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned PRI
def mysql ndb_binlog_index File 2 NULL NO varchar 255 255 NULL NULL latin1 latin1_swedish_ci varchar(255)
-def mysql ndb_binlog_index inserts 4 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned
+def mysql ndb_binlog_index gci 10 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned
+def mysql ndb_binlog_index inserts 4 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned
+def mysql ndb_binlog_index orig_epoch 9 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned PRI
+def mysql ndb_binlog_index orig_server_id 8 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned PRI
def mysql ndb_binlog_index Position 1 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned
-def mysql ndb_binlog_index schemaops 7 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned
-def mysql ndb_binlog_index updates 5 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned
+def mysql ndb_binlog_index schemaops 7 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned
+def mysql ndb_binlog_index updates 5 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned
def mysql plugin dl 2 NO varchar 128 384 NULL NULL utf8 utf8_general_ci varchar(128)
def mysql plugin name 1 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) PRI
def mysql proc body 11 NULL NO longblob 4294967295 4294967295 NULL NULL NULL NULL longblob
@@ -467,10 +470,13 @@ NULL mysql innodb_table_stats sum_of_oth
NULL mysql ndb_binlog_index Position bigint NULL NULL NULL NULL bigint(20) unsigned
1.0000 mysql ndb_binlog_index File varchar 255 255 latin1 latin1_swedish_ci varchar(255)
NULL mysql ndb_binlog_index epoch bigint NULL NULL NULL NULL bigint(20) unsigned
-NULL mysql ndb_binlog_index inserts bigint NULL NULL NULL NULL bigint(20) unsigned
-NULL mysql ndb_binlog_index updates bigint NULL NULL NULL NULL bigint(20) unsigned
-NULL mysql ndb_binlog_index deletes bigint NULL NULL NULL NULL bigint(20) unsigned
-NULL mysql ndb_binlog_index schemaops bigint NULL NULL NULL NULL bigint(20) unsigned
+NULL mysql ndb_binlog_index inserts int NULL NULL NULL NULL int(10) unsigned
+NULL mysql ndb_binlog_index updates int NULL NULL NULL NULL int(10) unsigned
+NULL mysql ndb_binlog_index deletes int NULL NULL NULL NULL int(10) unsigned
+NULL mysql ndb_binlog_index schemaops int NULL NULL NULL NULL int(10) unsigned
+NULL mysql ndb_binlog_index orig_server_id int NULL NULL NULL NULL int(10) unsigned
+NULL mysql ndb_binlog_index orig_epoch bigint NULL NULL NULL NULL bigint(20) unsigned
+NULL mysql ndb_binlog_index gci int NULL NULL NULL NULL int(10) unsigned
3.0000 mysql plugin name varchar 64 192 utf8 utf8_general_ci varchar(64)
3.0000 mysql plugin dl varchar 128 384 utf8 utf8_general_ci varchar(128)
3.0000 mysql proc db char 64 192 utf8 utf8_bin char(64)
=== modified file 'mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result 2011-09-06 12:43:05 +0000
+++ b/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result 2011-09-25 19:36:01 +0000
@@ -36,6 +36,8 @@ def mysql innodb_index_stats 0 mysql PRI
def mysql innodb_table_stats 0 mysql PRIMARY 1 database_name A #CARD# NULL NULL BTREE
def mysql innodb_table_stats 0 mysql PRIMARY 2 table_name A #CARD# NULL NULL BTREE
def mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A #CARD# NULL NULL BTREE
+def mysql ndb_binlog_index 0 mysql PRIMARY 2 orig_server_id A #CARD# NULL NULL BTREE
+def mysql ndb_binlog_index 0 mysql PRIMARY 3 orig_epoch A #CARD# NULL NULL BTREE
def mysql plugin 0 mysql PRIMARY 1 name A #CARD# NULL NULL BTREE
def mysql proc 0 mysql PRIMARY 1 db A #CARD# NULL NULL BTREE
def mysql proc 0 mysql PRIMARY 2 name A #CARD# NULL NULL BTREE
@@ -104,6 +106,8 @@ def mysql innodb_index_stats 0 mysql PRI
def mysql innodb_table_stats 0 mysql PRIMARY 1 database_name A #CARD# NULL NULL BTREE
def mysql innodb_table_stats 0 mysql PRIMARY 2 table_name A #CARD# NULL NULL BTREE
def mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A #CARD# NULL NULL BTREE
+def mysql ndb_binlog_index 0 mysql PRIMARY 2 orig_server_id A #CARD# NULL NULL BTREE
+def mysql ndb_binlog_index 0 mysql PRIMARY 3 orig_epoch A #CARD# NULL NULL BTREE
def mysql plugin 0 mysql PRIMARY 1 name A #CARD# NULL NULL BTREE
def mysql proc 0 mysql PRIMARY 1 db A #CARD# NULL NULL BTREE
def mysql proc 0 mysql PRIMARY 2 name A #CARD# NULL NULL BTREE
=== modified file 'mysql-test/suite/innodb/r/innodb-index.result'
--- a/mysql-test/suite/innodb/r/innodb-index.result 2011-09-07 10:08:09 +0000
+++ b/mysql-test/suite/innodb/r/innodb-index.result 2011-09-25 20:20:21 +0000
@@ -880,7 +880,7 @@ Table Op Msg_type Msg_text
test.t1 check status OK
explain select * from t1 where b like 'adfd%';
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 range b b 769 NULL 11 Using where
+1 SIMPLE t1 ALL b NULL NULL NULL 15 Using where
drop table t1;
set global innodb_file_per_table=on;
set global innodb_file_format='Barracuda';
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result 2011-09-06 12:43:05 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result 2011-09-25 19:39:25 +0000
@@ -56,7 +56,7 @@ ERROR 1050 (42S01) at line 1026: Table '
ERROR 1050 (42S01) at line 1035: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1044: Table 'users' already exists
ERROR 1050 (42S01) at line 1054: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1474: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1679: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_table";
Tables_in_performance_schema (user_table)
@@ -117,7 +117,7 @@ ERROR 1050 (42S01) at line 1026: Table '
ERROR 1050 (42S01) at line 1035: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1044: Table 'users' already exists
ERROR 1050 (42S01) at line 1054: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1474: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1679: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_view";
Tables_in_performance_schema (user_view)
@@ -176,7 +176,7 @@ ERROR 1050 (42S01) at line 1026: Table '
ERROR 1050 (42S01) at line 1035: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1044: Table 'users' already exists
ERROR 1050 (42S01) at line 1054: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1474: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1679: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@@ -235,7 +235,7 @@ ERROR 1050 (42S01) at line 1026: Table '
ERROR 1050 (42S01) at line 1035: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1044: Table 'users' already exists
ERROR 1050 (42S01) at line 1054: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1474: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1679: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@@ -294,7 +294,7 @@ ERROR 1050 (42S01) at line 1026: Table '
ERROR 1050 (42S01) at line 1035: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1044: Table 'users' already exists
ERROR 1050 (42S01) at line 1054: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1474: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1679: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema';
name
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-cluster branch (magnus.blaudd:3368 to 3369) | magnus.blaudd | 26 Sep |
