From: Davi Arnaut Date: February 27 2009 12:27pm Subject: bzr commit into mysql-5.1-bugteam branch (Davi.Arnaut:2827) Bug#36540 List-Archive: http://lists.mysql.com/commits/67838 X-Bug: 36540 Message-Id: <200902271227.n1RCRgET013310@rhel5-ia64-a.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0526920250889689336==" --===============0526920250889689336== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///data0/my/darnaut/mysql-repo/work/36540-5.1/ based on revid:msvensson@stripped 2827 Davi Arnaut 2009-02-27 Bug#36540: CREATE EVENT and ALTER EVENT statements fail with large server_id The problem is that creating a event could fail if the value of the variable server_id didn't fit in the originator column of the event system table. The cause is two-fold: it was possible to set server_id to a value outside the documented range (from 0 to 2^32-1) and the originator column of the event table didn't have enough room for values in this range. The log tables (general_log and slow_log) also don't have a proper column type to store the server_id and having a large server_id value could prevent queries from being logged. The solution is to ensure that all system tables that store the server_id value have a proper column type (int unsigned) and that the variable can't be set to a value that is not within the range. @ mysql-test/r/events_bugs.result Add test case result for Bug#36540 @ mysql-test/r/log_tables.result Update column type. @ mysql-test/r/system_mysql_db.result Update column type. @ mysql-test/r/variables.result Add test case result for server_id value range. @ mysql-test/suite/sys_vars/r/server_id_basic_64.result Update test case results. @ mysql-test/t/events_bugs.test Add test case for Bug#36540 @ mysql-test/t/log_tables.test Fix column type. @ mysql-test/t/variables.test Add test case for server_id value range. @ scripts/mysql_system_tables.sql Columns that store the server_id value must be of type INT UNSIGNED, fix event (originator), general_log and slow_log (server_id) tables in accordance. @ scripts/mysql_system_tables_fix.sql Columns that store the server_id value must be of type INT UNSIGNED, fix event (originator), general_log and slow_log (server_id) tables in accordance. @ sql/mysqld.cc Set min and max values for the server_id variable. Unfortunately we can't easily change server_id variable type from ulong to uint32 because of the sys_var classes. modified: mysql-test/r/events_bugs.result mysql-test/r/log_tables.result mysql-test/r/system_mysql_db.result mysql-test/r/variables.result mysql-test/suite/sys_vars/r/server_id_basic_64.result mysql-test/t/events_bugs.test mysql-test/t/log_tables.test mysql-test/t/variables.test scripts/mysql_system_tables.sql scripts/mysql_system_tables_fix.sql sql/mysqld.cc === modified file 'mysql-test/r/events_bugs.result' --- a/mysql-test/r/events_bugs.result 2009-01-23 12:22:05 +0000 +++ b/mysql-test/r/events_bugs.result 2009-02-27 12:23:38 +0000 @@ -736,6 +736,17 @@ select replace(@full_mode, 'ALLOW_INVALI select name from mysql.event where name = 'p' and sql_mode = @full_mode; name drop event e1; +SET @old_server_id = @@GLOBAL.server_id; +SET GLOBAL server_id = (1 << 32) - 1; +SELECT @@GLOBAL.server_id; +@@GLOBAL.server_id +4294967295 +CREATE EVENT ev1 ON SCHEDULE EVERY 1 DAY DO SELECT 1; +SELECT event_name, originator FROM INFORMATION_SCHEMA.EVENTS; +event_name originator +ev1 4294967295 +DROP EVENT ev1; +SET GLOBAL server_id = @old_server_id; DROP DATABASE events_test; SET GLOBAL event_scheduler= 'ON'; SET @@global.concurrent_insert= @concurrent_insert; === modified file 'mysql-test/r/log_tables.result' --- a/mysql-test/r/log_tables.result 2008-11-13 19:19:00 +0000 +++ b/mysql-test/r/log_tables.result 2009-02-27 12:23:38 +0000 @@ -56,7 +56,7 @@ general_log CREATE TABLE `general_log` ( `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `user_host` mediumtext NOT NULL, `thread_id` int(11) NOT NULL, - `server_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, `command_type` varchar(64) NOT NULL, `argument` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log' @@ -65,7 +65,7 @@ Field Type Null Key Default Extra event_time timestamp NO CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP user_host mediumtext NO NULL thread_id int(11) NO NULL -server_id int(11) NO NULL +server_id int(10) unsigned NO NULL command_type varchar(64) NO NULL argument mediumtext NO NULL show create table mysql.slow_log; @@ -80,7 +80,7 @@ slow_log CREATE TABLE `slow_log` ( `db` varchar(512) NOT NULL, `last_insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL, - `server_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, `sql_text` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log' show fields from mysql.slow_log; @@ -94,7 +94,7 @@ rows_examined int(11) NO NULL db varchar(512) NO NULL last_insert_id int(11) NO NULL insert_id int(11) NO NULL -server_id int(11) NO NULL +server_id int(10) unsigned NO NULL sql_text mediumtext NO NULL flush logs; flush tables; @@ -167,7 +167,7 @@ general_log CREATE TABLE `general_log` ( `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `user_host` mediumtext NOT NULL, `thread_id` int(11) NOT NULL, - `server_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, `command_type` varchar(64) NOT NULL, `argument` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log' @@ -183,7 +183,7 @@ slow_log CREATE TABLE `slow_log` ( `db` varchar(512) NOT NULL, `last_insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL, - `server_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, `sql_text` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log' alter table mysql.general_log engine=myisam; @@ -194,7 +194,7 @@ general_log CREATE TABLE `general_log` ( `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `user_host` mediumtext NOT NULL, `thread_id` int(11) NOT NULL, - `server_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, `command_type` varchar(64) NOT NULL, `argument` mediumtext NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='General log' @@ -210,7 +210,7 @@ slow_log CREATE TABLE `slow_log` ( `db` varchar(512) NOT NULL, `last_insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL, - `server_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, `sql_text` mediumtext NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Slow log' set global general_log='ON'; @@ -268,7 +268,7 @@ CREATE TABLE `general_log` ( ON UPDATE CURRENT_TIMESTAMP, `user_host` mediumtext NOT NULL, `thread_id` int(11) NOT NULL, -`server_id` int(11) NOT NULL, +`server_id` int(10) unsigned NOT NULL, `command_type` varchar(64) NOT NULL, `argument` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'; @@ -283,7 +283,7 @@ ON UPDATE CURRENT_TIMESTAMP, `db` varchar(512) NOT NULL, `last_insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL, -`server_id` int(11) NOT NULL, +`server_id` int(10) unsigned NOT NULL, `sql_text` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'; set global general_log='ON'; === modified file 'mysql-test/r/system_mysql_db.result' --- a/mysql-test/r/system_mysql_db.result 2008-02-28 11:21:44 +0000 +++ b/mysql-test/r/system_mysql_db.result 2009-02-27 12:23:38 +0000 @@ -227,7 +227,7 @@ event CREATE TABLE `event` ( `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') NOT NULL DEFAULT '', `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', - `originator` int(10) NOT NULL, + `originator` int(10) unsigned NOT NULL, `time_zone` char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM', `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, @@ -241,7 +241,7 @@ general_log CREATE TABLE `general_log` ( `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `user_host` mediumtext NOT NULL, `thread_id` int(11) NOT NULL, - `server_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, `command_type` varchar(64) NOT NULL, `argument` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log' @@ -257,7 +257,7 @@ slow_log CREATE TABLE `slow_log` ( `db` varchar(512) NOT NULL, `last_insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL, - `server_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, `sql_text` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log' show tables; === modified file 'mysql-test/r/variables.result' --- a/mysql-test/r/variables.result 2009-02-27 08:24:57 +0000 +++ b/mysql-test/r/variables.result 2009-02-27 12:23:38 +0000 @@ -1389,3 +1389,27 @@ SET @@session.thread_stack= 7; ERROR HY000: Variable 'thread_stack' is a read only variable SET @@global.thread_stack= 7; ERROR HY000: Variable 'thread_stack' is a read only variable +SET @old_server_id = @@GLOBAL.server_id; +SET GLOBAL server_id = (1 << 32) - 1; +SELECT @@GLOBAL.server_id; +@@GLOBAL.server_id +4294967295 +SET GLOBAL server_id = (1 << 32); +Warnings: +Warning 1292 Truncated incorrect server-id value: '4294967296' +SELECT @@GLOBAL.server_id; +@@GLOBAL.server_id +4294967295 +SET GLOBAL server_id = (1 << 64); +SELECT @@GLOBAL.server_id; +@@GLOBAL.server_id +0 +SET GLOBAL server_id = 0; +SELECT @@GLOBAL.server_id; +@@GLOBAL.server_id +0 +SET GLOBAL server_id = -1; +SELECT @@GLOBAL.server_id; +@@GLOBAL.server_id +0 +SET GLOBAL server_id = @old_server_id; === modified file 'mysql-test/suite/sys_vars/r/server_id_basic_64.result' --- a/mysql-test/suite/sys_vars/r/server_id_basic_64.result 2008-07-23 14:06:44 +0000 +++ b/mysql-test/suite/sys_vars/r/server_id_basic_64.result 2009-02-27 12:23:38 +0000 @@ -60,9 +60,11 @@ SELECT @@global.server_id; @@global.server_id 0 SET @@global.server_id = 2147483649*2; +Warnings: +Warning 1292 Truncated incorrect server-id value: '4294967298' SELECT @@global.server_id; @@global.server_id -4294967298 +4294967295 SET @@global.server_id = 65530.34.; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1 SET @@global.server_id = '125'; === modified file 'mysql-test/t/events_bugs.test' --- a/mysql-test/t/events_bugs.test 2009-01-23 12:22:05 +0000 +++ b/mysql-test/t/events_bugs.test 2009-02-27 12:23:38 +0000 @@ -1209,6 +1209,18 @@ select replace(@full_mode, 'ALLOW_INVALI select name from mysql.event where name = 'p' and sql_mode = @full_mode; drop event e1; +# +# Bug#36540: CREATE EVENT and ALTER EVENT statements fail with large server_id +# + +SET @old_server_id = @@GLOBAL.server_id; +SET GLOBAL server_id = (1 << 32) - 1; +SELECT @@GLOBAL.server_id; +CREATE EVENT ev1 ON SCHEDULE EVERY 1 DAY DO SELECT 1; +SELECT event_name, originator FROM INFORMATION_SCHEMA.EVENTS; +DROP EVENT ev1; +SET GLOBAL server_id = @old_server_id; + ########################################################################### # # End of tests === modified file 'mysql-test/t/log_tables.test' --- a/mysql-test/t/log_tables.test 2008-11-13 19:19:00 +0000 +++ b/mysql-test/t/log_tables.test 2009-02-27 12:23:38 +0000 @@ -287,7 +287,7 @@ CREATE TABLE `general_log` ( ON UPDATE CURRENT_TIMESTAMP, `user_host` mediumtext NOT NULL, `thread_id` int(11) NOT NULL, - `server_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, `command_type` varchar(64) NOT NULL, `argument` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'; @@ -303,7 +303,7 @@ CREATE TABLE `slow_log` ( `db` varchar(512) NOT NULL, `last_insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL, - `server_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, `sql_text` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'; === modified file 'mysql-test/t/variables.test' --- a/mysql-test/t/variables.test 2009-02-27 08:24:57 +0000 +++ b/mysql-test/t/variables.test 2009-02-27 12:23:38 +0000 @@ -1121,3 +1121,20 @@ SET @@session.thread_stack= 7; --error ER_INCORRECT_GLOBAL_LOCAL_VAR SET @@global.thread_stack= 7; # + +# +# Bug#36540: CREATE EVENT and ALTER EVENT statements fail with large server_id +# + +SET @old_server_id = @@GLOBAL.server_id; +SET GLOBAL server_id = (1 << 32) - 1; +SELECT @@GLOBAL.server_id; +SET GLOBAL server_id = (1 << 32); +SELECT @@GLOBAL.server_id; +SET GLOBAL server_id = (1 << 64); +SELECT @@GLOBAL.server_id; +SET GLOBAL server_id = 0; +SELECT @@GLOBAL.server_id; +SET GLOBAL server_id = -1; +SELECT @@GLOBAL.server_id; +SET GLOBAL server_id = @old_server_id; === modified file 'scripts/mysql_system_tables.sql' --- a/scripts/mysql_system_tables.sql 2008-07-31 09:50:24 +0000 +++ b/scripts/mysql_system_tables.sql 2009-02-27 12:23:38 +0000 @@ -66,7 +66,7 @@ CREATE TABLE IF NOT EXISTS procs_priv ( -- Create general_log if CSV is enabled. -SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, thread_id INTEGER NOT NULL, server_id INTEGER NOT NULL, command_type VARCHAR(64) NOT NULL, argument MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="General log"', 'SET @dummy = 0'); +SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, thread_id INTEGER NOT NULL, server_id INTEGER UNSIGNED NOT NULL, command_type VARCHAR(64) NOT NULL, argument MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="General log"', 'SET @dummy = 0'); PREPARE stmt FROM @str; EXECUTE stmt; @@ -74,13 +74,13 @@ DROP PREPARE stmt; -- Create slow_log if CSV is enabled. -SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512) NOT NULL, last_insert_id INTEGER NOT NULL, insert_id INTEGER NOT NULL, server_id INTEGER NOT NULL, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="Slow log"', 'SET @dummy = 0'); +SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512) NOT NULL, last_insert_id INTEGER NOT NULL, insert_id INTEGER NOT NULL, server_id INTEGER UNSIGNED NOT NULL, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="Slow log"', 'SET @dummy = 0'); PREPARE stmt FROM @str; EXECUTE stmt; 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 int(10) 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 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; === modified file 'scripts/mysql_system_tables_fix.sql' --- a/scripts/mysql_system_tables_fix.sql 2008-04-04 16:46:05 +0000 +++ b/scripts/mysql_system_tables_fix.sql 2009-02-27 12:23:38 +0000 @@ -216,6 +216,20 @@ ALTER TABLE func MODIFY type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL; # +# Modify log tables. +# + +SET @old_log_state = @@global.general_log; +SET GLOBAL general_log = 'OFF'; +ALTER TABLE general_log MODIFY COLUMN server_id INTEGER UNSIGNED NOT NULL; +SET GLOBAL general_log = @old_log_state; + +SET @old_log_state = @@global.slow_query_log; +SET GLOBAL slow_query_log = 'OFF'; +ALTER TABLE slow_log MODIFY COLUMN server_id INTEGER UNSIGNED NOT NULL; +SET GLOBAL slow_query_log = @old_log_state; + +# # Detect whether we had Create_view_priv # SET @hadCreateViewPriv:=0; @@ -471,7 +485,10 @@ ALTER TABLE event MODIFY sql_mode 'PAD_CHAR_TO_FULL_LENGTH' ) DEFAULT '' NOT NULL AFTER on_completion; ALTER TABLE event MODIFY name char(64) CHARACTER SET utf8 NOT NULL default ''; -ALTER TABLE event ADD COLUMN originator INT(10) NOT NULL AFTER comment; + +ALTER TABLE event MODIFY COLUMN originator INT UNSIGNED NOT NULL; +ALTER TABLE event ADD COLUMN originator INT UNSIGNED NOT NULL AFTER comment; + ALTER TABLE event MODIFY COLUMN status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED'; ALTER TABLE event ADD COLUMN time_zone char(64) CHARACTER SET latin1 === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc 2009-02-25 08:49:02 +0000 +++ b/sql/mysqld.cc 2009-02-27 12:23:38 +0000 @@ -6245,7 +6245,7 @@ Can't be set to 1 if --log-slave-updates GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"server-id", OPT_SERVER_ID, "Uniquely identifies the server instance in the community of replication partners.", - (uchar**) &server_id, (uchar**) &server_id, 0, GET_ULONG, REQUIRED_ARG, 0, 0, 0, + (uchar**) &server_id, (uchar**) &server_id, 0, GET_ULONG, REQUIRED_ARG, 0, 0, UINT_MAX32, 0, 0, 0}, {"set-variable", 'O', "Change the value of a variable. Please note that this option is deprecated;you can set variables directly with --variable-name=value.", --===============0526920250889689336== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/davi.arnaut@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: davi.arnaut@stripped # target_branch: file:///data0/my/darnaut/mysql-repo/work/36540-5.1/ # testament_sha1: 6fed9657710d30d605f93341404894b3dbdd9a63 # timestamp: 2009-02-27 13:27:42 +0100 # base_revision_id: msvensson@stripped\ # v8kn8g2lkm530jrv # # Begin bundle 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 1Ma8XiVksz5csXNpdYcnUf/i7kinChIbPaD54A== --===============0526920250889689336==--