From: Date: March 13 2009 10:17am Subject: bzr commit into mysql-5.1-bugteam branch (joro:2836) Bug#36540 List-Archive: http://lists.mysql.com/commits/69108 X-Bug: 36540 Message-Id: <200903130917.n2D9HFOc003227@magare.gmz> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4381123840495379925==" --===============4381123840495379925== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/kgeorge/mysql/work/mysql-5.1-merge/ based on revid:joro@stripped 2836 Georgi Kodinov 2009-03-13 addendum to bug #36540 : fix the funcs_1 test suite. modified: mysql-test/suite/funcs_1/r/is_columns_mysql.result === modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result' --- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result 2008-03-07 19:18:14 +0000 +++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result 2009-03-13 09:16:32 +0000 @@ -48,7 +48,7 @@ NULL mysql event last_executed 10 NULL Y NULL mysql event modified 9 0000-00-00 00:00:00 NO timestamp NULL NULL NULL NULL NULL NULL timestamp select,insert,update,references NULL mysql event name 2 NO char 64 192 NULL NULL utf8 utf8_general_ci char(64) PRI select,insert,update,references NULL mysql event on_completion 14 DROP NO enum 8 24 NULL NULL utf8 utf8_general_ci enum('DROP','PRESERVE') select,insert,update,references -NULL mysql event originator 17 NULL NO int NULL NULL 10 0 NULL NULL int(10) select,insert,update,references +NULL mysql event originator 17 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references NULL mysql event sql_mode 15 NO set 478 1434 NULL NULL utf8 utf8_general_ci 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') select,insert,update,references NULL mysql event starts 11 NULL YES datetime NULL NULL NULL NULL NULL NULL datetime select,insert,update,references NULL mysql event status 13 ENABLED NO enum 18 54 NULL NULL utf8 utf8_general_ci enum('ENABLED','DISABLED','SLAVESIDE_DISABLED') select,insert,update,references @@ -60,7 +60,7 @@ NULL mysql func type 4 NULL NO enum 9 27 NULL mysql general_log argument 6 NULL NO mediumtext 16777215 16777215 NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references NULL mysql general_log command_type 5 NULL NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references NULL mysql general_log event_time 1 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL NULL NULL timestamp on update CURRENT_TIMESTAMP select,insert,update,references -NULL mysql general_log server_id 4 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references +NULL mysql general_log server_id 4 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references NULL mysql general_log thread_id 3 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references NULL mysql general_log user_host 2 NULL NO mediumtext 16777215 16777215 NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references NULL mysql help_category help_category_id 1 NULL NO smallint NULL NULL 5 0 NULL NULL smallint(5) unsigned PRI select,insert,update,references @@ -150,7 +150,7 @@ NULL mysql slow_log lock_time 4 NULL NO NULL mysql slow_log query_time 3 NULL NO time NULL NULL NULL NULL NULL NULL time select,insert,update,references NULL mysql slow_log rows_examined 6 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references NULL mysql slow_log rows_sent 5 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references -NULL mysql slow_log server_id 10 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references +NULL mysql slow_log server_id 10 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references NULL mysql slow_log sql_text 11 NULL NO mediumtext 16777215 16777215 NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references NULL mysql slow_log start_time 1 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL NULL NULL timestamp on update CURRENT_TIMESTAMP select,insert,update,references NULL mysql slow_log user_host 2 NULL NO mediumtext 16777215 16777215 NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references @@ -329,7 +329,7 @@ NULL mysql event ends datetime NULL NULL 3.0000 mysql event on_completion enum 8 24 utf8 utf8_general_ci enum('DROP','PRESERVE') 3.0000 mysql event sql_mode set 478 1434 utf8 utf8_general_ci 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') 3.0000 mysql event comment char 64 192 utf8 utf8_bin char(64) -NULL mysql event originator int NULL NULL NULL NULL int(10) +NULL mysql event originator int NULL NULL NULL NULL int(10) unsigned 1.0000 mysql event time_zone char 64 64 latin1 latin1_swedish_ci char(64) 3.0000 mysql event character_set_client char 32 96 utf8 utf8_bin char(32) 3.0000 mysql event collation_connection char 32 96 utf8 utf8_bin char(32) @@ -342,7 +342,7 @@ NULL mysql func ret tinyint NULL NULL NU NULL mysql general_log event_time timestamp NULL NULL NULL NULL timestamp 1.0000 mysql general_log user_host mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext NULL mysql general_log thread_id int NULL NULL NULL NULL int(11) -NULL mysql general_log server_id int NULL NULL NULL NULL int(11) +NULL mysql general_log server_id int NULL NULL NULL NULL int(10) unsigned 3.0000 mysql general_log command_type varchar 64 192 utf8 utf8_general_ci varchar(64) 1.0000 mysql general_log argument mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext NULL mysql help_category help_category_id smallint NULL NULL NULL NULL smallint(5) unsigned @@ -434,7 +434,7 @@ NULL mysql slow_log rows_examined int NU 3.0000 mysql slow_log db varchar 512 1536 utf8 utf8_general_ci varchar(512) NULL mysql slow_log last_insert_id int NULL NULL NULL NULL int(11) NULL mysql slow_log insert_id int NULL NULL NULL NULL int(11) -NULL mysql slow_log server_id int NULL NULL NULL NULL int(11) +NULL mysql slow_log server_id int NULL NULL NULL NULL int(10) unsigned 1.0000 mysql slow_log sql_text mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext 3.0000 mysql tables_priv Host char 60 180 utf8 utf8_bin char(60) 3.0000 mysql tables_priv Db char 64 192 utf8 utf8_bin char(64) --===============4381123840495379925== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/joro@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: joro@stripped # target_branch: file:///home/kgeorge/mysql/work/mysql-5.1-merge/ # testament_sha1: c82c37440a52b051865a579f1d8af1c2d1abcc7e # timestamp: 2009-03-13 11:17:15 +0200 # source_branch: bzr+ssh://bk-internal/bzrroot/server/mysql-5.0-\ # bugteam/ # base_revision_id: joro@stripped # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWduNLKIAAfnfgEAwWWf//1KN ggC////wUASYo3nW5mtOrt3bVzhJREnkZJ4KeTJmVDRkaZNNADTTQJKI1MZDU0yTIMnpNM1ANBoB oBIoJkEmUPaEyeponqepkDCBtINBzAATAAEwAAAAAElExNNNI01M0yEyZQPU8po8UaAekZvgorko rgpcnAUdmrzFJSTQfcO1VqSBWFy8AoW5cJuqgeWR4U3UWQ1pfTulFikhb8YY55164Ui/X+5bjxtY mzl+ANkrC6GkjDCUDB53NzjCwnCuN3pq7OU5BnbiY5h8MKaGnJhwvFVm2vrmkqshZlZm3JNtrgEa p3cJ5WCisEw4m2iDPwZr2QgWrRLb59Is2mkcBF82tBHol3oxrmDir7UjROYrFKODcmC79i1JoKBY 10QUE0DFaV6/RXl7FK2Bg3yn25w7hU11szN13EJaZGoPQt+ScgK4rkjK1csMTyScsuI4NOAWCZhX JBZP6oWN5lGqmT3nIcKR64DTgLgZzKVjzJQFKwGmRVoHjUEChw0W8TDSDru1JKBoJKXTfjiqkyKJ pQXXTE5QMhvw4lI8zHI1rVJbnjJR8ytiLJceEmXqe0uBxobrJmJUNHkgNBOtXJimmlRr3CnhMp+R XR3shUVnGQtcY1mmLBxZzCrpe1MoM8FQu0mmFk83sHaCslATunRMvCRcTKUJVpUZYpxIZgn0nitD F9WcbyUx8WaNzRs8j5fSNkCxwj5/QRY5MYz9Mff6IA7oA5CSeLuCCtFVoWLNQLdzGQWeDc1NzBoc TQbT/YY5OJWWhvYdspkudl90xbljU5tuE95p1HQRISeN9t+hBgRuFA6ipo4fiVhMbebL2nVdBGWB rE8GBfmuMDkUpy+I2IvkYKpzWuJiUy2s3B+Y4kL3sDQd3tu6iJjfkPAkGaCpFr89wO8eCoV9RmKG JiO7rbHhMyK2QXgwMqrMSyBIY6HXkUAPT8+1VEi/YbDEtIqk9N3kd2ab2qr1b24aA09graRXEkE5 YMFxebIU4GOVFYD4MlrJZ+Ah5oPIgTFp1BAwmRCyrus4L87HxmBrOekC80d9GoZG3hHnPcama04u Tt+UwD6S0MWsUygNzzrB6o1GLOs2VUVBA83bIzYK1zREorVSU5dOQsyjqHqOBy3i7Z1GuqNQhsc4 mi8iB0xUYjgohqE0ofKG/1KCqJisGJg2hrWp9k9QjXP0jAOcSqA6FEYslhIv4RvxKnZKWIosHOwU Va5jGEkEUQza+WaR6i8d5qNIMLDZu9mJAYh4MI7RQ5pyiL2q7lz6Wo2Xu2BzJoW2OsJokxNMUh9R 1LcpajespJoU0EhwqQG0qB1FxLWR2JEkNDNVR0EOmBjzZRFoXBVOM6Fm8qdElpk9OerHCDxwIqha FwpWKe86c7ja7wjQTMkrTREhSKvnUsXvYZCKqCG+UDyNiwvgV0mxMoFQoOYxlUDPBIZWszzRLuId a4rCdRL/F3JFOFCQ240sog== --===============4381123840495379925==--