From: Davi Arnaut
Date: March 11 2009 8:31pm
Subject: bzr commit into mysql-5.1-bugteam branch (davi:2832) Bug#36540
List-Archive: http://lists.mysql.com/commits/68951
X-Bug: 36540
Message-Id: <20090311203110.13C9DEC0F1@skynet.ctb.virtua.com.br>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2125491696594208843=="

--===============2125491696594208843==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# At a local mysql-5.1-bugteam repository of davi

 2832 Davi Arnaut	2009-03-11
      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-03-11 20:30:56 +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-03-11 20:30:56 +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-03-11 20:30:56 +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-03-06 15:11:34 +0000
+++ b/mysql-test/r/variables.result	2009-03-11 20:30:56 +0000
@@ -1426,4 +1426,32 @@ Catalog	Database	Table	Table_alias	Colum
 def					@@storage_engine	253	6	6	N	1	31	8
 @@storage_engine
 MyISAM
+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 << 60);
+Warnings:
+Warning	1292	Truncated incorrect server-id value: '1152921504606846976'
+SELECT @@GLOBAL.server_id;
+@@GLOBAL.server_id
+4294967295
+SET GLOBAL server_id = 0;
+SELECT @@GLOBAL.server_id;
+@@GLOBAL.server_id
+0
+SET GLOBAL server_id = -1;
+Warnings:
+Warning	1292	Truncated incorrect server_id value: '-1'
+SELECT @@GLOBAL.server_id;
+@@GLOBAL.server_id
+0
+SET GLOBAL server_id = @old_server_id;
 End of 5.1 tests

=== 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-03-11 20:30:56 +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-03-11 20:30:56 +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-03-11 20:30:56 +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-03-09 14:26:53 +0000
+++ b/mysql-test/t/variables.test	2009-03-11 20:30:56 +0000
@@ -1164,5 +1164,21 @@ SET GLOBAL expire_logs_days = @old_eld;
 select @@storage_engine;
 --disable_metadata
 
+#
+# 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 << 60);
+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;
 
 --echo End of 5.1 tests

=== 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-03-11 20:30:56 +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','N
 OT_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','N
 OT_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-03-11 20:30:56 +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-03-05 09:48:03 +0000
+++ b/sql/mysqld.cc	2009-03-11 20:30:56 +0000
@@ -6249,7 +6249,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.",


--===============2125491696594208843==
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:///home/davi/bzr/work/36540-5.1/
# testament_sha1: 8a628cb67359df472b1d4889caf7f5c1d4f457e1
# timestamp: 2009-03-11 17:31:09 -0300
# base_revision_id: joro@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVhaxzcADQhfgEAwWff//3/v
//H////wYBinNehbX32t3ffXPW71ybXpLt33m4G+87vsFdw1vlfXvSvtz668N6u925vV9ZO9d7d5
7tzvdjQ0GXvagGs9mktU0PQSUEaU8iMn6mk8RNNMm0oM0mm1Mm1NADRk0NNASSAE0CCm1T9Kem1T
0ajaRpkBoNDT1PUAaMjQShNNT1NU08gpofqNQeoADTQGgANABoaBISQCBMTCmVN6iabER6nqb0hP
U9CNA3qh6j1ABFImgTTTQCDIaBpM1BU0z1GkbUep6nlD1AAEkQEaIMjRNNMgVH5NUeobUaMRoDQD
yJpo3OM8x8Qj7yBSDT4cCxWXnMKpWWb9GNMvDZ8xPFrWGILjEmp7AbUyF+CcxvbdPx2XPDsjL4TQ
7LcALDMRru0lUh78YHNQEwxfFKM3Z4l+rr1LX/Ldj1xk0nmYxgai7SEKSvbekijVl2ekKNjwLhAv
gxJ1jczJdjy50Hf9co3rm21oNXCUJSjhTmfKE87RgWdVqtXGYf6HTuNfv2Oc9fnaRV3Q/CByDiQr
1lEhTA+5+nO7TGiwqc9+CXnwDyU7FIIiIIhYiISIENttjY2ii5f5h/hAujRqZqxraXSud8LSFm31
rraycne+/vmBhDLKXvL6Q6F+GWWDaNNLVemZPCTRrz4YVb2ClsJmPFt4N6yqs5nMLQmJlSubfg9T
LzK+i1S2JCnkB0PoPAR/0Yu8sQPI1rvCEggIICAg3/SjtrPkdyfqW63+fBl5vgxu7aWy9NR/KU/Q
jtO5OM1sPC4EbyCuROYqaMFM2UjmcvSuXHlwXE3GiFL/Vw+D7buExtTMKdhqCFmwzMMIYZK5vO48
5RKqYN5kMeadYpmGNUvekbxz2MzXlVYRoolpr1+EC8ihvGsGhjB+2bXJmTkcoZ8i+a1ZfQuwS24q
pSNC6peB31B88C844KlLeBQ2sIuzMz93r+YfjoY4FK4exn0cEfYhScWlfdXselNMmla6cOTnUyz4
TIpXEVUDRjVVSqbBWTXCIRdHWX0jKQpoX07ZlFINACBYgRYsO5ybvwOzsmZdmuSeWTLPk+nec48w
v3iRJwbTOHbZ0t9isSZ5Z3rWznUqMGV8UlS5mLVVV03ecMwdGsB5NVFNr4sHMM5mtdr6/Z63e2En
u6et2zFojfA3SHVRO5rGtGm7jNSNerXt+lLbNkF3ifyQZ3dNdSo/0QrT8Pdyy3n3ejtzdBtnIcZC
hhIzpl07RJrn5XUP2OJHsxOkYMc/ebDu6vZa/+j0qZ4367tur34GJpfXEPr+48ShpP3NyMEmNKMg
02Rw+xD6H0OAQA8VsYN0kvi/E+fzB6ejLrRh4+Xv84KT8yJ4pLEkTgNgRJgoNoTDD3vE++pfdxbg
Nk9pEpe+wdIbSaELcHqmrTsWpSlSXiuhNBe9dfqwg0SC6TviciZiOUQpMi8y+Y0f3RbnaO7Y9zS0
bJtc0OC/exkzdAHJsXi1VAqjtV65uGWyex8Embz9P8jhCojNEEwyFg/HZ+GLyYjMjKUjkKWSfxIA
O8G/8dCnHbnb/liZwKKZO+5iKwqJvlY7ufuO7v3ISvYTucSpruas1Gki/ldgZ3FqSV5SsWk8MSaJ
ZqDJthxIBtIVS5ZUYowTGY2FVow3lBsG5phYMoqEbWX6Rc3skWvuO0tJnAssbr4aQuoxenD5mPX2
xeIVSNx6eCYITeXKU0LRU3GpGI8sx2vEM2HSBQgLbKiyEqGSuzeZkToIHTciREL0mXJsbJCwYJYu
eyew5+DDMoZ/MBM63lK7OI4WFSz3JK9womVTBUV3AkRJ8ZRIVctCSEma5fs3FyCsOeOuKbp1UxCe
M7EiQkBwcfqFDhF2Na18e+76vOSuULegoOHUBh7hmoIPSk2JdAUonCQ5c6cYqwQyaEcTFYLaKpXp
GDVGU6bqNEkNHUWqMzHukrKJ3HjvKGs0vqWSuGJsucEzznOvK4UMnEwox0DtnMCyNxsP/RICFX1g
/IoGvMZ427cqieU95Kk+O+QXQsPJX5gINgoiFgOT4ESwoX1ImrMgQLBI1CzLFh0gogpdtLPLJWLz
UiWHWENQdA3XDsWEaBN1oUdLG0ZmHNEa8STGJKIjSU0JRLoJPMgjICKXONoWKlTSolbU2mRoVMjt
DrWpQsZnWbE6sFKhrbKNmvO2kIQg942ka8dWLpGLnFwa+VJGRYsrJC2JojDhwi7GhKS8zzgdgNUv
C4aHpYPNMff+HI/LoYGhjgETmORGAxM+e6JxWFCmRuO1f6/yiBK65Wv7cTiMTOwnqOB0JBIoZjlL
9ygmneD4A5U1HcY9aGJoSOBDyXX9i8gc2Beu9b8hi8c35tAptzkiMoBwgEIoj3Z0MwioJmNLVgnE
dzEfSIhQU4xcLLgXDk1h7z2ZfkMVI5FTMyI3aqLiuJGQ1B8e47Tmp5ZXGJeXOWN8ZLSZ4nHt4wwX
ToSA0LmGWewxCzMwZgrGZuKBYWETSPJgjxEqpDVoWpZlnT+dc6qsqutE1wa9vPuK/PG3d1JTC+0l
d41ErmGtHb6ju8l1g1mG8QZggBhImWMchmMp3LE6kVDeEEYVM2JQwz5GxS2CE1EtosokSG2G8eE4
LLAkQWIxvPClAxVjEufEqHyhYyKrvCFQ0OKYzN5Y8q7KLw861WYeL/o4Pw8XB6nly8zF1m46/C7u
lBOIq7K61HidxzmNElvLzVWqvKMq1oaF4s7qiY8PCXkj50brdTUaw11goeAnJGZuIHRUmSAjt8FJ
S2bNxuNdaHU4QLMhaQJnwDI1EgqVNZQLGB4kB1181iSXP1XwXF1+ley1qi47b9H2nXY7tDPtjVZx
Jp1xkcCFCBO4nfM5cnRDsJgQO9vjI0NhevYMpU1cFHPPq8Ch40LTbvMA20LSCopOikevVz+I27tH
td35pI08Hc2FRinCZvGPNaiAXKauXeurTVl2rx2K/AxOejauUeM4qzUzgZarRkjyIrS5RE0lBit1
7RiXySbQXljwFVFMoHu2WB0jDiJcroUeYkjSebXhoJ5kVC5iSMDQcGRAxChiuyPijMpYLupFTcsh
giTMRhMAFCT3sEEPUCZkTIQJGhIpUqBFhPmbU5WKkbEgNShtGVomhMozalR5GbyREvIkYFSBoWPL
y2hQuMTaVu6cgkGSwZEmRZsnPMn2NJBJI3SdIlMekQBOlOOrUmJUSLoulwR7nukxV72hXESsj215
hjhVd9hO+w3uwkL44vVheBTdVYq/I/WB9Piar53gNJfW1AAtY/TIwGPEcR40Sn6EjaUm0MbQho/D
i2foE8PQpDUWXZ2wEwEDgOMRDCgwNEknDAJTKJ6VeIX7zYlz8hxeXr/ig0dSgRexI+H3WW8HYZ5w
zFHhJ3oIE7fHckdnkId0gD19hrEMgdygSUXJfUHZ81dxwTYmxxgRvHQQjyEtpRryPOxv4UaW4kBS
YTIJYtGYh1ZbyJ8kfaTAKgPNTWAGLMzIZmZiasKqP3ar1GuqmSlEHyMCRFSpduj5fd2oijgOmBwd
drJ+Q6rp9wwjU3ARQAkkydnKXBzJx/DRWEa9lgCFTInnu1Y7QUFlVepDJDIbBvaGD5m0iWPevaTX
CFBIJhbARzGRAPvNb9cXtvfZmjwN65mZQbE5uUXS07RLKTJAnsKTUwtp3TeCuNIDbtjemclq1Ypu
XPERWdxFiYBvwRK5IVGOEsF4+PJPkyJ96+e/eI6Aj/zcQIgkQiwaeGs+ZLCgCBi1jcJC7kycuIhF
BQFg6TROllcmdeZpyoWcOYwODqKkyEJR7wZwUfpwSClhRVEMtYhqUn8C2CAWmQK5aaCGY5AxDEWI
SuLQRmzGqCHE2GJoUTFwNS1EF5cyUvupXjWzAGrZdisLrSAW5leZEXOopIozaWBjS/PFzFtk1hQI
5TZAoszVU2SsmJ7RGu1n3VpUjAuNpmG2yLpK4ZNQtiQZrKQbUycknxNZVmbW7sPdE8hJ5xIAlFLG
1psIvbrW2U/A3OD6uyheqmRCmBh39e/lFqiVBD4JwR0BxJFFKFUmBuI1rg6QqU2kMViTvbVgOvbZ
mYNwVHU4WLmIMF57eKqVhm2/e+CMClXZOu6/BcA7rjZSfAvFHaZ9LNsDELUKW4DIrThaZ+xxIyqc
2glS+ywDyAETNPHNtkHMX1iqNK4fV8C/cjf2558V143XSw6mvdPjd9eFZSqKzxuuxkMas7Xdth3u
YibWreMsNMsbfAh5hN8Q7nF3iD5IVqzCp4xAnbElCikAlbOcCQpNAlIWn6sdBkabmAT+aL1+KvUD
LPyeIGlwjNgvvDRKLBPQwyGHw9USb4UMYBVgOtLrGEP6TUyAXSdxuD8z8S5imPvIKIwZDHaf1+hU
/DeyZAzMmYhiIYCILD9DI1l7oPzqdml0n5Pd+rcURrF/zDIJLlHhY+MAGz2choAHAO8Qa9LyHdwL
XCOsuMBGb9pKW9QjvNQXWC/kI/mBLQeeSbU7bnHZ8zicqZKScnUNkFsSJSYikRouQLmFSQJTogGo
oSE6an09JhlGMFvmINBmO9WhaUnAuE+0QvkuJY8TuMP55aLabTtMTO42GK3HRHM1kFI9VeebmN5I
wC45uRgNryeeI4wAHRKsxrdtwmp7HOnJziOXwIMafcLZMZjaUMOuRq7TqLDYebg5MsObF7KMjori
7ihi2iWANDM6HsGsyH2HMZXFSBjSRgptbvYCY0o4w5QdOwcWWACGE8sWB5RMcA8KkZBFmWDjo5zk
tEQM0AXUudJNJMlUhyRcwZZCph8giXI7TfyO06iB3ySoYG84F8yhxT0ZoTIecTRLBlDRCmTLLCws
sUHZIGkwcD4N5yf2OSMKb+B+3BJVhgKC4VjtgWkSoyQcToVMw0vgpSxZxClU4dSsUwGguYOSt3Hk
Th58OXZ0b4w8gxIG+MlWmEpm6+7BkSPQWHUU7Simx0tAlzI7mYeGD1ta6yU1lgo3sNNm0ZngkU5H
Er8ph2jEAY9CQ4bMfKsKQbbF5hE9V6mBYzMRyx+IwDWfj496RohOaG5pBXCzZdZtVJi2aTcdW7uk
ayooczl2GyCYa+MY0YS6nWZD83aMhmOJHmr8nEFoNdVVVlkt64rQ25LFVuZAUPXT7NwDqLMHhZ7O
4Mr0hwjTTgxDQr/k5uy37deZYBIl6D8gWbMBWIkJFBtT1OIpiRRoQ01IWAANqyB/CxK/HpkJXBKD
36dHbKTLUFgh0sjOA4/I9IN1hMGlJLSZjSNN84DQZCjQZzNoLRq840qVqpEsCZMOAWBXG1dFiZFD
IoQBOXmgLybs+KRx71PqpkDmiZWmpqfhdBHt7GDvvQn5Szcni47m7W8nNmCQkEMQRB7JHu5NLGoA
rJNV71lXmEJ4qfaYSI2shffWOz7aLscje5KVFTzPN+o1RUoBw0qcRtB/o6eVTlSo8mVYW2uEYxmk
QoKDZZZ8wGEbF7Dx2kvs+RT+cMQRCRAe/pwfJ2NDqX0a+ZWm8K+bkqE5woxM+rPtV2Dgyw8MzzhF
PBglCsQqt5b8zxNN+Jvoj4sVPBhS0Au9Gj7BmFTU9LMFw8nccJ7oqaYOhSoJCTk7V3aBXHfANYb8
Pd9g4loxD34Qss2ZCZg4B0fNpuhvMWsyENVKeIcdu5tfztW5xU47qr5S/gGYRyPs1U5WWR8+D70E
fIft6HmI8nhuTxvZnudD5erW8WnH2c9bneYu7o+5AaNL3vY1Pe7re+TwJwgQR28aNaOIe7g2JbDA
EIRv8g3QXMQegZNr1FyfV/32o73WpBEECBQhkgGjS3jt3ilbSLquvIqcyHNGtCYDEsti52tTXzsM
8dcQK15Vrv7QJYVraitKDaVKAcJvCLVZYF6GVTBWrWphBN3iP73Wc6wfWb7PZmzhCBGJqsCLXUo5
/NM5LxmGFsNgrpGnKe1UyBT1mo9amYwuUA6vnS1IyF8vBtxRpb9jEwyImjruHay7EASdXUanY1M2
gO4i6Bx2EEIz05rVLQW+YUagYhiTyoeRY9eojEnZAzyaVywSsUBe5XgfRs9XG3r4vgYw3bTOZAFq
shCFCCGIRYfofJ+HOzDD6+b8oCU+yx8rM9fw7nJvcxpDBqqmcbj/GnmbxsbFAwdTcX+IPMH/IxwO
2KlU3pbCNM8k/qM7XZYwhPHAhYCGqBaEB1/e9fuf/WuLqbg7NdMzKZyxt+b8NVxnzCNiGk2KJ1hQ
H5dOgDoc3s2A8kMgMuHm0hsbcPVqpsavhh0aGCsNjxe4PN3N56mh1y7GoNm9QebsC506mMQxfryv
wIWXvIlKQQBBB0fn9qMZg3pM9lgSRQowk5A/FENVE4MG3gcgw1VASzVhlCNnZ/GamUM6wyDPJWV8
djUpnD2Mz4O8o1/mIvcaCA9tLHzehbttgIXBg9pGOED9gNCSNyoibDLd0ipcsWTcQsqQ/CANNuhk
YBkzNA4xWYuswnMaQw4j9Djv4nmvcuqFuD6nuZGkh3yJ6je95D4DCNYQpOF6H7yoKAHj63RL5g6L
nbbYDANWKbcQCW4Qop8NEXxrNLZ5mTPakbXrkkkkkkkkkkkkkiuOPUATgCyFiEqIXM5I6O7TBuKk
HjQkBuv1hATbxcBZh0KnKBSQAejTPyO1mcQk5ZM4LjWtLh8S8t/HoLaqbZ7OpLCtRe0WVUWH3123
cFHSop264IxV1wA6VJppprWrthQDvo+Hi/Rq8qYEzK6BHCXEqUlDAaRSGc9y6ECKRUDYxS4dFL5j
Jm71GAkyfKRejqC4gWrJwqFJ3i7nO5lKIeUCQTkf179JeFTYZNrs/0/mLlQMGPnWPqqpG8QblgnH
1sHUzYcFPRJGG6jVb1uEwoyDVAaDM7m/zar2p0eh1uInZAdA9Ekf2pfh9hPk5VmXFsKUyBoKeHXp
LkPbcAHZzDxMwDWrg0B3wsfOQEtCl72urHDLU5eOL6mxq0EVnxYmTRpqPHPjCMQHxxflKTKrYnU3
uCPi/nITBRSsJB7m4P4bgoi+bFYh6trzeb3vY92c5OlrdJ6Heo73l5zA7bWPBgKnAue+w9Hm7H52
vw9b1wcA0hVN/d28WDQ8XtbHOWqUBb2MoVwK0828mPLUPfRAHnU9EuB6vKmxVI5PARxcrUOfgalE
gXU9b93iV0DO73sdVwTdZve5mI9amljZg8Cwlc+nDa3d7ianYHF1n/4u5IpwoSCwtY5u


--===============2125491696594208843==--