From: Marc Alff Date: March 7 2010 5:11pm Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3123) List-Archive: http://lists.mysql.com/commits/102517 Message-Id: <20100307171135.ED79F45E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3112308563309653993==" --===============3112308563309653993== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3123 Marc Alff 2010-03-07 [merge] local merge added: mysql-test/include/ctype_utf8mb4.inc mysql-test/r/ctype_utf8mb4_heap.result mysql-test/r/ctype_utf8mb4_innodb.result mysql-test/r/ctype_utf8mb4_myisam.result mysql-test/r/ctype_utf8mb4_ndb.result mysql-test/suite/sys_vars/r/log_error_func.result mysql-test/suite/sys_vars/r/log_error_func2.result mysql-test/suite/sys_vars/r/log_error_func3.result mysql-test/suite/sys_vars/t/log_error_func.cnf mysql-test/suite/sys_vars/t/log_error_func.test mysql-test/suite/sys_vars/t/log_error_func2.cnf mysql-test/suite/sys_vars/t/log_error_func2.test mysql-test/suite/sys_vars/t/log_error_func3.test mysql-test/t/ctype_utf8mb4_heap.test mysql-test/t/ctype_utf8mb4_innodb.test mysql-test/t/ctype_utf8mb4_myisam.test mysql-test/t/ctype_utf8mb4_ndb.test modified: COPYING README configure.in include/m_ctype.h mysql-test/collections/default.experimental mysql-test/lib/v1/mysql-test-run.pl mysql-test/r/ctype_utf8mb4.result mysql-test/t/ctype_utf8mb4.test sql-common/client.c sql/mysql_priv.h sql/mysqld.cc sql/sys_vars.cc strings/ctype-uca.c strings/ctype-ucs2.c strings/ctype-utf8.c === added file 'mysql-test/suite/perfschema/r/pfs_upgrade.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade.result 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result 2010-03-05 15:31:01 +0000 @@ -0,0 +1,153 @@ +drop table if exists test.user_table; +drop procedure if exists test.user_proc; +drop function if exists test.user_func; +drop event if exists test.user_event; +"Testing mysql_upgrade with TABLE performance_schema.user_table" +create table test.user_table(a int); +use performance_schema; +show tables like "user_table"; +Tables_in_performance_schema (user_table) +user_table +ERROR 1644 (HY000) at line 178: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 203: Table 'COND_INSTANCES' already exists +ERROR 1050 (42S01) at line 233: Table 'EVENTS_WAITS_CURRENT' already exists +ERROR 1050 (42S01) at line 247: Table 'EVENTS_WAITS_HISTORY' already exists +ERROR 1050 (42S01) at line 261: Table 'EVENTS_WAITS_HISTORY_LONG' already exists +ERROR 1050 (42S01) at line 281: Table 'EVENTS_WAITS_SUMMARY_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 302: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists +ERROR 1050 (42S01) at line 323: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 340: Table 'FILE_INSTANCES' already exists +ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 379: Table 'FILE_SUMMARY_BY_INSTANCE' already exists +ERROR 1050 (42S01) at line 396: Table 'MUTEX_INSTANCES' already exists +ERROR 1050 (42S01) at line 414: Table 'PERFORMANCE_TIMERS' already exists +ERROR 1050 (42S01) at line 431: Table 'PROCESSLIST' already exists +ERROR 1050 (42S01) at line 449: Table 'RWLOCK_INSTANCES' already exists +ERROR 1050 (42S01) at line 465: Table 'SETUP_CONSUMERS' already exists +ERROR 1050 (42S01) at line 482: Table 'SETUP_INSTRUMENTS' already exists +ERROR 1050 (42S01) at line 502: Table 'SETUP_OBJECTS' already exists +ERROR 1050 (42S01) at line 518: Table 'SETUP_TIMERS' already exists +FATAL ERROR: Upgrade failed +show tables like "user_table"; +Tables_in_performance_schema (user_table) +user_table +use test; +drop table test.user_table; +"Testing mysql_upgrade with VIEW performance_schema.user_view" +create view test.user_view as select "Not supposed to be here"; +use performance_schema; +show tables like "user_view"; +Tables_in_performance_schema (user_view) +user_view +ERROR 1644 (HY000) at line 178: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 203: Table 'COND_INSTANCES' already exists +ERROR 1050 (42S01) at line 233: Table 'EVENTS_WAITS_CURRENT' already exists +ERROR 1050 (42S01) at line 247: Table 'EVENTS_WAITS_HISTORY' already exists +ERROR 1050 (42S01) at line 261: Table 'EVENTS_WAITS_HISTORY_LONG' already exists +ERROR 1050 (42S01) at line 281: Table 'EVENTS_WAITS_SUMMARY_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 302: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists +ERROR 1050 (42S01) at line 323: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 340: Table 'FILE_INSTANCES' already exists +ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 379: Table 'FILE_SUMMARY_BY_INSTANCE' already exists +ERROR 1050 (42S01) at line 396: Table 'MUTEX_INSTANCES' already exists +ERROR 1050 (42S01) at line 414: Table 'PERFORMANCE_TIMERS' already exists +ERROR 1050 (42S01) at line 431: Table 'PROCESSLIST' already exists +ERROR 1050 (42S01) at line 449: Table 'RWLOCK_INSTANCES' already exists +ERROR 1050 (42S01) at line 465: Table 'SETUP_CONSUMERS' already exists +ERROR 1050 (42S01) at line 482: Table 'SETUP_INSTRUMENTS' already exists +ERROR 1050 (42S01) at line 502: Table 'SETUP_OBJECTS' already exists +ERROR 1050 (42S01) at line 518: Table 'SETUP_TIMERS' already exists +FATAL ERROR: Upgrade failed +show tables like "user_view"; +Tables_in_performance_schema (user_view) +user_view +use test; +drop view test.user_view; +"Testing mysql_upgrade with PROCEDURE performance_schema.user_proc" +create procedure test.user_proc() +select "Not supposed to be here"; +update mysql.proc set db='performance_schema' where name='user_proc'; +ERROR 1644 (HY000) at line 178: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 203: Table 'COND_INSTANCES' already exists +ERROR 1050 (42S01) at line 233: Table 'EVENTS_WAITS_CURRENT' already exists +ERROR 1050 (42S01) at line 247: Table 'EVENTS_WAITS_HISTORY' already exists +ERROR 1050 (42S01) at line 261: Table 'EVENTS_WAITS_HISTORY_LONG' already exists +ERROR 1050 (42S01) at line 281: Table 'EVENTS_WAITS_SUMMARY_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 302: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists +ERROR 1050 (42S01) at line 323: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 340: Table 'FILE_INSTANCES' already exists +ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 379: Table 'FILE_SUMMARY_BY_INSTANCE' already exists +ERROR 1050 (42S01) at line 396: Table 'MUTEX_INSTANCES' already exists +ERROR 1050 (42S01) at line 414: Table 'PERFORMANCE_TIMERS' already exists +ERROR 1050 (42S01) at line 431: Table 'PROCESSLIST' already exists +ERROR 1050 (42S01) at line 449: Table 'RWLOCK_INSTANCES' already exists +ERROR 1050 (42S01) at line 465: Table 'SETUP_CONSUMERS' already exists +ERROR 1050 (42S01) at line 482: Table 'SETUP_INSTRUMENTS' already exists +ERROR 1050 (42S01) at line 502: Table 'SETUP_OBJECTS' already exists +ERROR 1050 (42S01) at line 518: Table 'SETUP_TIMERS' already exists +FATAL ERROR: Upgrade failed +select name from mysql.proc where db='performance_schema'; +name +user_proc +update mysql.proc set db='test' where name='user_proc'; +drop procedure test.user_proc; +"Testing mysql_upgrade with FUNCTION performance_schema.user_func" +create function test.user_func() returns integer +return 0; +update mysql.proc set db='performance_schema' where name='user_func'; +ERROR 1644 (HY000) at line 178: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 203: Table 'COND_INSTANCES' already exists +ERROR 1050 (42S01) at line 233: Table 'EVENTS_WAITS_CURRENT' already exists +ERROR 1050 (42S01) at line 247: Table 'EVENTS_WAITS_HISTORY' already exists +ERROR 1050 (42S01) at line 261: Table 'EVENTS_WAITS_HISTORY_LONG' already exists +ERROR 1050 (42S01) at line 281: Table 'EVENTS_WAITS_SUMMARY_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 302: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists +ERROR 1050 (42S01) at line 323: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 340: Table 'FILE_INSTANCES' already exists +ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 379: Table 'FILE_SUMMARY_BY_INSTANCE' already exists +ERROR 1050 (42S01) at line 396: Table 'MUTEX_INSTANCES' already exists +ERROR 1050 (42S01) at line 414: Table 'PERFORMANCE_TIMERS' already exists +ERROR 1050 (42S01) at line 431: Table 'PROCESSLIST' already exists +ERROR 1050 (42S01) at line 449: Table 'RWLOCK_INSTANCES' already exists +ERROR 1050 (42S01) at line 465: Table 'SETUP_CONSUMERS' already exists +ERROR 1050 (42S01) at line 482: Table 'SETUP_INSTRUMENTS' already exists +ERROR 1050 (42S01) at line 502: Table 'SETUP_OBJECTS' already exists +ERROR 1050 (42S01) at line 518: Table 'SETUP_TIMERS' already exists +FATAL ERROR: Upgrade failed +select name from mysql.proc where db='performance_schema'; +name +user_func +update mysql.proc set db='test' where name='user_func'; +drop function test.user_func; +"Testing mysql_upgrade with EVENT performance_schema.user_event" +create event test.user_event on schedule every 1 day do +select "not supposed to be here"; +update mysql.event set db='performance_schema' where name='user_event'; +ERROR 1644 (HY000) at line 178: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 203: Table 'COND_INSTANCES' already exists +ERROR 1050 (42S01) at line 233: Table 'EVENTS_WAITS_CURRENT' already exists +ERROR 1050 (42S01) at line 247: Table 'EVENTS_WAITS_HISTORY' already exists +ERROR 1050 (42S01) at line 261: Table 'EVENTS_WAITS_HISTORY_LONG' already exists +ERROR 1050 (42S01) at line 281: Table 'EVENTS_WAITS_SUMMARY_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 302: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists +ERROR 1050 (42S01) at line 323: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 340: Table 'FILE_INSTANCES' already exists +ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists +ERROR 1050 (42S01) at line 379: Table 'FILE_SUMMARY_BY_INSTANCE' already exists +ERROR 1050 (42S01) at line 396: Table 'MUTEX_INSTANCES' already exists +ERROR 1050 (42S01) at line 414: Table 'PERFORMANCE_TIMERS' already exists +ERROR 1050 (42S01) at line 431: Table 'PROCESSLIST' already exists +ERROR 1050 (42S01) at line 449: Table 'RWLOCK_INSTANCES' already exists +ERROR 1050 (42S01) at line 465: Table 'SETUP_CONSUMERS' already exists +ERROR 1050 (42S01) at line 482: Table 'SETUP_INSTRUMENTS' already exists +ERROR 1050 (42S01) at line 502: Table 'SETUP_OBJECTS' already exists +ERROR 1050 (42S01) at line 518: Table 'SETUP_TIMERS' already exists +FATAL ERROR: Upgrade failed +select name from mysql.event where db='performance_schema'; +name +user_event +update mysql.event set db='test' where name='user_event'; +drop event test.user_event; === added file 'mysql-test/suite/perfschema/t/pfs_upgrade.test' --- a/mysql-test/suite/perfschema/t/pfs_upgrade.test 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/perfschema/t/pfs_upgrade.test 2010-03-05 15:31:01 +0000 @@ -0,0 +1,137 @@ +# Copyright (C) 2010 Oracle and/or its affiliates. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# Tests for PERFORMANCE_SCHEMA +# Make sure mysql_upgrade does not destroy data in a 'performance_schema' +# database. +# + +--source include/not_embedded.inc +--source include/have_perfschema.inc + +--disable_warnings +drop table if exists test.user_table; +drop procedure if exists test.user_proc; +drop function if exists test.user_func; +drop event if exists test.user_event; +--enable_warnings + +--echo "Testing mysql_upgrade with TABLE performance_schema.user_table" + +create table test.user_table(a int); + +let $MYSQLD_DATADIR= `SELECT @@datadir`; +--copy_file $MYSQLD_DATADIR/test/user_table.frm $MYSQLD_DATADIR/performance_schema/user_table.frm + +# Make sure the table is visible +use performance_schema; +show tables like "user_table"; + +--error 1 +--exec $MYSQL_UPGRADE --skip-verbose > $MYSQLTEST_VARDIR/tmp/pfs_upgrade.out 2> $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + +# Verify that mysql_upgrade complained about the performance_schema +--cat_file $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + +# Make sure the table is still visible +show tables like "user_table"; + +use test; + +--remove_file $MYSQLD_DATADIR/performance_schema/user_table.frm +drop table test.user_table; + +--echo "Testing mysql_upgrade with VIEW performance_schema.user_view" + +create view test.user_view as select "Not supposed to be here"; + +let $MYSQLD_DATADIR= `SELECT @@datadir`; +--copy_file $MYSQLD_DATADIR/test/user_view.frm $MYSQLD_DATADIR/performance_schema/user_view.frm + +# Make sure the view is visible +use performance_schema; +show tables like "user_view"; + +--error 1 +--exec $MYSQL_UPGRADE --skip-verbose > $MYSQLTEST_VARDIR/tmp/pfs_upgrade.out 2> $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + +# Verify that mysql_upgrade complained about the performance_schema +--cat_file $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + +# Make sure the view is still visible +show tables like "user_view"; + +use test; + +--remove_file $MYSQLD_DATADIR/performance_schema/user_view.frm +drop view test.user_view; + +--echo "Testing mysql_upgrade with PROCEDURE performance_schema.user_proc" + +create procedure test.user_proc() + select "Not supposed to be here"; + +update mysql.proc set db='performance_schema' where name='user_proc'; + +--error 1 +--exec $MYSQL_UPGRADE --skip-verbose > $MYSQLTEST_VARDIR/tmp/pfs_upgrade.out 2> $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + +# Verify that mysql_upgrade complained about the performance_schema +--cat_file $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + +select name from mysql.proc where db='performance_schema'; + +update mysql.proc set db='test' where name='user_proc'; +drop procedure test.user_proc; + +--echo "Testing mysql_upgrade with FUNCTION performance_schema.user_func" + +create function test.user_func() returns integer + return 0; + +update mysql.proc set db='performance_schema' where name='user_func'; + +--error 1 +--exec $MYSQL_UPGRADE --skip-verbose > $MYSQLTEST_VARDIR/tmp/pfs_upgrade.out 2> $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + +# Verify that mysql_upgrade complained about the performance_schema +--cat_file $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + +select name from mysql.proc where db='performance_schema'; + +update mysql.proc set db='test' where name='user_func'; +drop function test.user_func; + +--echo "Testing mysql_upgrade with EVENT performance_schema.user_event" + +create event test.user_event on schedule every 1 day do + select "not supposed to be here"; + +update mysql.event set db='performance_schema' where name='user_event'; + +--error 1 +--exec $MYSQL_UPGRADE --skip-verbose > $MYSQLTEST_VARDIR/tmp/pfs_upgrade.out 2> $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + +# Verify that mysql_upgrade complained about the performance_schema +--cat_file $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + +select name from mysql.event where db='performance_schema'; + +update mysql.event set db='test' where name='user_event'; +drop event test.user_event; + +--remove_file $MYSQLTEST_VARDIR/tmp/pfs_upgrade.out +--remove_file $MYSQLTEST_VARDIR/tmp/pfs_upgrade.err + === modified file 'scripts/mysql_system_tables.sql' --- a/scripts/mysql_system_tables.sql 2010-01-12 01:47:27 +0000 +++ b/scripts/mysql_system_tables.sql 2010-03-05 15:31:01 +0000 @@ -1,4 +1,4 @@ --- Copyright (C) 2008-2009 Sun Microsystems, Inc +-- Copyright (C) 2008, 2010 Oracle and/or its affiliates. All rights reserved. -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -100,18 +100,92 @@ CREATE TABLE IF NOT EXISTS event ( db ch 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; +-- +-- PERFORMANCE SCHEMA INSTALLATION +-- Note that this script is also reused by mysql_upgrade, +-- so we have to be very careful here to not destroy any +-- existing database named 'performance_schema' if it +-- can contain user data. +-- In case of downgrade, it's ok to drop unknown tables +-- from a future version, as long as they belong to the +-- performance schema engine. +-- + +set @have_old_pfs= (select count(*) from information_schema.schemata where schema_name='performance_schema'); + +SET @l1="SET @broken_tables = (select count(*) from information_schema.tables"; +SET @l2=" where engine != \'PERFORMANCE_SCHEMA\' and table_schema=\'performance_schema\')"; +SET @cmd=concat(@l1,@l2); + +-- Work around for bug#49542 +SET @str = IF(@have_old_pfs = 1, @cmd, 'SET @broken_tables = 0'); +PREPARE stmt FROM @str; +EXECUTE stmt; +DROP PREPARE stmt; + +SET @l1="SET @broken_views = (select count(*) from information_schema.views"; +SET @l2=" where table_schema='performance_schema')"; +SET @cmd=concat(@l1,@l2); + +-- Work around for bug#49542 +SET @str = IF(@have_old_pfs = 1, @cmd, 'SET @broken_views = 0'); +PREPARE stmt FROM @str; +EXECUTE stmt; +DROP PREPARE stmt; + +SET @broken_routines = (select count(*) from mysql.proc where db='performance_schema'); + +SET @broken_events = (select count(*) from mysql.event where db='performance_schema'); + +SET @broken_pfs= (select @broken_tables + @broken_views + @broken_routines + @broken_events); -- -- The performance schema database. --- This database is always created, even in --without-perfschema builds, +-- Only drop and create the database if this is safe (no broken_pfs). +-- This database is created, even in --without-perfschema builds, -- so that the database name is always reserved by the MySQL implementation. -- -set @have_pfs= (select count(engine) from information_schema.engines where engine='PERFORMANCE_SCHEMA' and support != 'NO'); +SET @cmd= "DROP DATABASE IF EXISTS performance_schema"; + +SET @str = IF(@broken_pfs = 0, @cmd, 'SET @dummy = 0'); +PREPARE stmt FROM @str; +EXECUTE stmt; +DROP PREPARE stmt; + +SET @cmd= "CREATE DATABASE performance_schema character set utf8"; -DROP DATABASE IF EXISTS performance_schema; +SET @str = IF(@broken_pfs = 0, @cmd, 'SET @dummy = 0'); +PREPARE stmt FROM @str; +EXECUTE stmt; +DROP PREPARE stmt; + +-- +-- Unlike 'performance_schema', the 'mysql' database is reserved already, +-- so no user procedure is supposed to be there +-- +drop procedure if exists mysql.die; +create procedure mysql.die() signal sqlstate 'HY000' set message_text='Unexpected content found in the performance_schema database.'; + +-- +-- For broken upgrades, SIGNAL the error +-- + +SET @cmd="call mysql.die()"; -CREATE DATABASE performance_schema character set utf8; +SET @str = IF(@broken_pfs > 0, @cmd, 'SET @dummy = 0'); +PREPARE stmt FROM @str; +EXECUTE stmt; +DROP PREPARE stmt; + +drop procedure mysql.die; + +-- +-- From this point, only create the performance schema tables +-- if the server is build with performance schema +-- + +set @have_pfs= (select count(engine) from information_schema.engines where engine='PERFORMANCE_SCHEMA' and support != 'NO'); -- -- TABLE COND_INSTANCES --===============3112308563309653993== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\ # 45194/ # testament_sha1: 3aa3bb062d4a01bb56be067ddb9419211c535309 # timestamp: 2010-03-07 10:11:35 -0700 # base_revision_id: bjorn.munch@stripped\ # rkpjnk79lduy3y0s # # Begin bundle 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 zG4MpZ/xdyRThQkKnEhaAA== --===============3112308563309653993==--