List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:February 15 2011 1:47pm
Subject:bzr push into mysql-5.5-telco-7.0 branch (magnus.blaudd:3206 to 3211)
View as plain text  
 3211 Magnus Blåudd	2011-02-15
      ndb
       - update .test file to only include "ndb_log_update%" variables in show
       - fix .result file for the above and also that sql_log_update is now removed
        (it should not have been in the .result file in the first place)

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result
      mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test
 3210 Magnus Blåudd	2011-02-15
      ndb
       - the mysql.ndb_binlog_index has new layout
       - add code to update to new schema for ndb_binlog_index to
        mysql_system_tables_fix.sql and put the new table definition
        in mysql_system_tables.sql

    modified:
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_fix.sql
 3209 Magnus Blåudd	2011-02-15
      ndb
       - remove the "Converted FIXED field to DYNAMIC .. " warnings from .result file,
        either we add them back when this is supported again, disable warnings
        or rewrite theese alters that are not there to test that we get this specific
        warning

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result
      mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result
      mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result
 3208 Magnus Blåudd	2011-02-15
      ndb
       - fix result file, the DROP TABLE statement is logged in uppercase and has
        a comment saying "genereted by server"

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result
 3207 Magnus Blåudd	2011-02-15
      ndb
       - fix ndb_binlog_ignore_db testcase by removing the unneccessary "drops" in
        beginning of testcase and thus the binlog should be empty since it should
        all have been filtered away by the --binlog-ignore-db=mysqltest argument
        which mysqld was started with
       - add one more statement which shouldn't be binlogged either

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result
      mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test
 3206 Magnus Blåudd	2011-02-15
      ndb
       - remove use of nonstandard type in header
       - uint -> unsigned int

    modified:
      sql/ndb_local_connection.h
=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result	2008-02-25 13:50:20 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result	2011-02-15 09:51:38 +0000
@@ -12,8 +12,6 @@ select @max_epoch:=max(epoch)-1 from mys
 #
 delete from t1;
 alter table t1 add (b int);
-Warnings:
-Warning	1478	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 insert into t1 values (3,3),(4,4);
 alter table t1 rename t2;
 begin;

=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result	2010-10-27 11:32:32 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result	2011-02-15 09:51:38 +0000
@@ -21,8 +21,6 @@ mysqld-bin.000001	#	Query	1	#	use `test`
 reset master;
 reset master;
 alter table t2 add column (b int);
-Warnings:
-Warning	1478	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 mysqld-bin.000001	#	Query	1	#	use `test`; alter table t2 add column (b int)
@@ -195,4 +193,4 @@ mysqld-bin.000001	#	Table_map	2	#	table_
 mysqld-bin.000001	#	Write_rows	2	#	table_id: #
 mysqld-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F
 mysqld-bin.000001	#	Query	2	#	COMMIT
-mysqld-bin.000001	#	Query	2	#	use `test`; drop table t2
+mysqld-bin.000001	#	Query	2	#	use `test`; DROP TABLE `t2` /* generated by server */

=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result	2010-10-27 11:32:32 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result	2011-02-15 09:01:09 +0000
@@ -1,11 +1,10 @@
 reset master;
-drop table if exists t1;
-drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
 create table t1 (a int primary key, b int) engine=ndb;
 insert into t1 values (1, 1);
+use test;
+insert into mysqltest.t1 values(2,2);
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-mysqld-bin.000001	#	Query	1	#	use `test`; drop table if exists t1
 drop database mysqltest;

=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result	2010-10-27 11:32:32 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result	2011-02-15 09:51:38 +0000
@@ -9,8 +9,6 @@ create table t1 (a int key, b int) engin
 create table t2 (a int key, b int) engine=ndb;
 insert into t1 values (1,1);
 alter table t1 add c int;
-Warnings:
-Warning	1478	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 reset master;

=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result	2009-10-07 17:16:52 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result	2011-02-15 10:38:28 +0000
@@ -7,11 +7,10 @@ flush logs;
 flush logs;
 flush logs;
 delete from ba;
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 Variable_name	Value
 ndb_log_update_as_write	ON
 ndb_log_updated_only	ON
-sql_log_update	ON
 select txt from binlog_stmts where txt not like '%ndb_apply_status%' order by txt;
 txt
 DELETE FROM test.ba WHERE   @1=2
@@ -26,11 +25,10 @@ ks	st	lp
 3	3	3
 4	4	40
 delete from ba;
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 Variable_name	Value
 ndb_log_update_as_write	ON
 ndb_log_updated_only	OFF
-sql_log_update	ON
 select txt from binlog_stmts where txt not like '%ndb_apply_status%' order by txt;
 txt
 DELETE FROM test.ba WHERE   @1=2   @2=2   @3=2
@@ -45,11 +43,10 @@ ks	st	lp
 3	3	3
 4	4	40
 delete from ba;
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 Variable_name	Value
 ndb_log_update_as_write	OFF
 ndb_log_updated_only	ON
-sql_log_update	ON
 select txt from binlog_stmts where txt not like '%ndb_apply_status%' order by txt;
 txt
 DELETE FROM test.ba WHERE   @1=2
@@ -64,11 +61,10 @@ ks	st	lp
 3	3	3
 4	4	40
 delete from ba;
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 Variable_name	Value
 ndb_log_update_as_write	OFF
 ndb_log_updated_only	OFF
-sql_log_update	ON
 select txt from binlog_stmts where txt not like '%ndb_apply_status%' order by txt;
 txt
 DELETE FROM test.ba WHERE   @1=2   @2=2   @3=2
@@ -84,11 +80,10 @@ ks	st	lp
 4	4	40
 drop table ba;
 reset master;
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 Variable_name	Value
 ndb_log_update_as_write	ON
 ndb_log_updated_only	ON
-sql_log_update	ON
 create table bah (tst int primary key, cvy int, sqs int, unique(sqs)) engine=ndb;
 insert into bah values (1,1,1);
 update bah set cvy= 2 where tst=1;

=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test	2008-02-25 13:50:20 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test	2011-02-15 09:01:09 +0000
@@ -2,15 +2,19 @@
 -- source include/have_binlog_format_mixed_or_row.inc
 reset master;
 
---disable_warnings
-drop table if exists t1;
-drop database if exists mysqltest;
---enable_warnings
+#
+# None of the below statements should be binlogged
+# since server is started with --binlog-ignore-db=mysqltest
+#
 
 create database mysqltest;
 use mysqltest;
 create table t1 (a int primary key, b int) engine=ndb;
 insert into t1 values (1, 1);
+
+use test;
+insert into mysqltest.t1 values(2,2);
+
 -- source include/show_binlog_events2.inc
 
 drop database mysqltest;

=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test	2010-12-14 19:28:08 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test	2011-02-15 10:38:28 +0000
@@ -97,7 +97,7 @@ delete from ba;
 
 connection mysqld1;
 
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 --source suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc
 
 --disable_query_log
@@ -111,7 +111,7 @@ delete from ba;
 
 connection mysqld2;
 
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 --source suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc
 
 --disable_query_log
@@ -126,7 +126,7 @@ delete from ba;
 
 connection mysqld3;
 
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 --source suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc
 
 --disable_query_log
@@ -140,7 +140,7 @@ delete from ba;
 
 connection mysqld4;
 
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 --source suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc
 
 --disable_query_log
@@ -175,7 +175,7 @@ flush logs;
 
 connection mysqld1;
 reset master;
-show variables like '%log_update%';
+show variables like 'ndb_log_update%';
 
 create table bah (tst int primary key, cvy int, sqs int, unique(sqs)) engine=ndb;
 

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2010-11-16 12:37:26 +0000
+++ b/scripts/mysql_system_tables.sql	2011-02-15 10:28:28 +0000
@@ -98,7 +98,7 @@ DROP PREPARE stmt;
 CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', name char(64) CHARACTER SET utf8 NOT NULL default '', body longblob NOT NULL, definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL, modified TIMESTAMP NOT NULL, last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode  set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', originator INTEGER UNSIGNED NOT NULL, time_zone char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM', character_set_client char(32) collate utf8_bin, collation_connection char(32) collate utf8_bin, db_collation char(32) collate utf8_bin, body_utf8 longblob, PRIMARY KEY (db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
 
 
-CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;
+CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts INT UNSIGNED NOT NULL, updates INT UNSIGNED NOT NULL, deletes INT UNSIGNED NOT NULL, schemaops INT UNSIGNED NOT NULL, orig_server_id INT UNSIGNED NOT NULL, orig_epoch BIGINT UNSIGNED NOT NULL, gci INT UNSIGNED NOT NULL, PRIMARY KEY(epoch, orig_server_id, orig_epoch)) ENGINE=MYISAM;
 
 --
 -- PERFORMANCE SCHEMA INSTALLATION

=== modified file 'scripts/mysql_system_tables_fix.sql'
--- a/scripts/mysql_system_tables_fix.sql	2010-08-09 08:32:50 +0000
+++ b/scripts/mysql_system_tables_fix.sql	2011-02-15 10:28:28 +0000
@@ -645,6 +645,20 @@ ALTER TABLE user MODIFY plugin char(60)
 
 CREATE TABLE IF NOT EXISTS proxy_priv (Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Proxied_User char(60) binary DEFAULT '' NOT NULL, Proxied_Host char(16) binary DEFAULT '' NOT NULL, With_Grant BOOL DEFAULT 0 NOT NULL, PRIMARY KEY Host (Host,User,Proxied_Host,Proxied_User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
 
+#
+# mysql.ndb_binlog_index
+#
+ALTER ndb_binlog_index
+  MODIFY inserts INT UNSIGNED NOT NULL,
+  MODIFY updates INT UNSIGNED NOT NULL,
+  MODIFY deletes INT UNSIGNED NOT NULL,
+  MODIFY schemaops INT UNSIGNED NOT NULL,
+  ADD orig_server_id INT UNSIGNED NOT NULL,
+  ADD orig_epoch BIGINT UNSIGNED NOT NULL,
+  ADD gci INT UNSIGNED NOT NULL,
+  DROP PRIMARY KEY,
+  ADD PRIMARY KEY(epoch, orig_server_id, orig_epoch);
+
 # Activate the new, possible modified privilege tables
 # This should not be needed, but gives us some extra testing that the above
 # changes was correct

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-telco-7.0 branch (magnus.blaudd:3206 to 3211) Magnus Blåudd15 Feb