From: Mattias Jonsson Date: January 28 2011 2:12pm Subject: bzr push into mysql-5.1 branch (mattias.jonsson:3554 to 3557) List-Archive: http://lists.mysql.com/commits/129879 Message-Id: <201101281413.p0SCTX3t029753@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3557 Mattias Jonsson 2011-01-28 minor fix of copyright header modified: sql/item_timefunc.h 3556 Mattias Jonsson 2011-01-27 Update of copyright headers for files I changed this year. modified: sql/item.h sql/item_func.h sql/item_timefunc.h sql/sql_partition.cc sql/table.cc 3555 Mattias Jonsson 2011-01-27 [merge] merge modified: mysql-test/suite/parts/inc/partition_check_drop.inc mysql-test/suite/parts/inc/partition_layout_check1.inc mysql-test/suite/parts/inc/partition_layout_check2.inc mysql-test/suite/parts/r/partition_recover_myisam.result mysql-test/suite/parts/t/partition_debug_sync_innodb.test mysql-test/suite/parts/t/partition_recover_myisam.test mysql-test/suite/parts/t/partition_special_innodb.test 3554 John H. Embretsen 2011-01-27 [merge] Merge two patches for bug 56895 into tip of mysql-5.1 branch. added: mysql-test/include/restart_slave_sql.inc mysql-test/include/rpl_connection_master.inc mysql-test/include/rpl_connection_slave.inc mysql-test/include/rpl_connection_slave1.inc modified: client/mysqladmin.cc client/mysqldump.c client/mysqltest.cc mysql-test/Makefile.am mysql-test/include/rpl_start_server.inc mysql-test/include/rpl_stop_server.inc mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/File/Path.pm mysql-test/lib/My/Find.pm mysql-test/lib/My/Options.pm mysql-test/lib/My/Platform.pm mysql-test/lib/My/SafeProcess.pm mysql-test/lib/My/SafeProcess/Base.pm mysql-test/lib/My/SafeProcess/CMakeLists.txt mysql-test/lib/My/SafeProcess/Makefile.am mysql-test/lib/My/SafeProcess/safe_kill_win.cc mysql-test/lib/My/SafeProcess/safe_process.cc mysql-test/lib/My/SafeProcess/safe_process_win.cc mysql-test/lib/My/SysInfo.pm mysql-test/lib/My/Test.pm mysql-test/lib/mtr_gcov.pl mysql-test/lib/mtr_gprof.pl mysql-test/lib/mtr_io.pl mysql-test/lib/mtr_match.pm mysql-test/lib/mtr_misc.pl mysql-test/lib/mtr_report.pm mysql-test/lib/mtr_stress.pl mysql-test/lib/mtr_unique.pm mysql-test/mysql-stress-test.pl mysql-test/mysql-test-run.pl mysql-test/r/client_xml.result mysql-test/r/ctype_many.result mysql-test/r/func_like.result mysql-test/r/mysqladmin.result mysql-test/r/mysqldump.result mysql-test/r/partition_error.result mysql-test/r/type_datetime.result mysql-test/r/xml.result mysql-test/suite/ndb/r/ndb_basic.result mysql-test/suite/ndb/t/ndb_basic.test mysql-test/suite/rpl/r/rpl_stop_slave.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_stop_slave.test mysql-test/suite/sys_vars/r/general_log_file_basic.result mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result mysql-test/suite/sys_vars/r/log_output_func.result mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result mysql-test/suite/sys_vars/t/div_precision_increment_func.test mysql-test/suite/sys_vars/t/general_log_file_basic.test mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test mysql-test/suite/sys_vars/t/log_output_func.test mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test mysql-test/t/ctype_many.test mysql-test/t/func_like.test mysql-test/t/gis.test mysql-test/t/mysqladmin.test mysql-test/t/mysqldump.test mysql-test/t/partition_error.test mysql-test/t/type_datetime.test mysql-test/t/xml.test mysql-test/valgrind.supp sql/item_cmpfunc.cc sql/item_strfunc.cc sql/item_strfunc.h sql/item_sum.h sql/slave.cc sql/sql_partition.cc sql/sql_repl.cc strings/bchange.c strings/bcopy-duff.c strings/bfill.c strings/bmove.c strings/bmove512.c strings/bmove_upp.c strings/conf_to_src.c strings/ctype-big5.c strings/ctype-bin.c strings/ctype-cp932.c strings/ctype-czech.c strings/ctype-euc_kr.c strings/ctype-eucjpms.c strings/ctype-extra.c strings/ctype-gb2312.c strings/ctype-gbk.c strings/ctype-latin1.c strings/ctype-mb.c strings/ctype-simple.c strings/ctype-sjis.c strings/ctype-tis620.c strings/ctype-uca.c strings/ctype-ucs2.c strings/ctype-ujis.c strings/ctype-utf8.c strings/ctype-win1250ch.c strings/ctype.c strings/decimal.c strings/do_ctype.c strings/dump_map.c strings/int2str.c strings/is_prefix.c strings/llstr.c strings/longlong2str.c strings/longlong2str_asm.c strings/memcmp.c strings/memcpy.c strings/memset.c strings/my_strchr.c strings/my_strtoll10.c strings/my_vsnprintf.c strings/r_strinstr.c strings/str2int.c strings/str_alloc.c strings/str_test.c strings/strappend.c strings/strcat.c strings/strcend.c strings/strchr.c strings/strcmp.c strings/strcont.c strings/strend.c strings/strfill.c strings/strinstr.c strings/strlen.c strings/strmake.c strings/strmov.c strings/strnlen.c strings/strnmov.c strings/strrchr.c strings/strstr.c strings/strto.c strings/strtod.c strings/strtol.c strings/strtoll.c strings/strtoul.c strings/strtoull.c strings/strxmov.c strings/strxnmov.c strings/uca-dump.c strings/uctypedump.c strings/udiv.c strings/utr11-dump.c strings/xml.c === modified file 'mysql-test/suite/parts/inc/partition_check_drop.inc' --- a/mysql-test/suite/parts/inc/partition_check_drop.inc 2008-08-04 05:04:47 +0000 +++ b/mysql-test/suite/parts/inc/partition_check_drop.inc 2011-01-18 22:55:39 +0000 @@ -66,10 +66,10 @@ if ($found_garbage) } # Do a manual cleanup, because the following tests should not suffer from # remaining files - --exec rm -f $MYSQLD_DATADIR/test/t1* || true + --remove_files_wildcard $MYSQLD_DATADIR/test t1* if ($with_directories) { - --exec rm -f $MYSQLTEST_VARDIR/tmp/t1* || true + --remove_files_wildcard $MYSQLTEST_VARDIR/tmp t1* } } --enable_query_log === modified file 'mysql-test/suite/parts/inc/partition_layout_check1.inc' --- a/mysql-test/suite/parts/inc/partition_layout_check1.inc 2009-02-01 12:00:48 +0000 +++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc 2011-01-18 22:55:39 +0000 @@ -29,14 +29,10 @@ DELETE FROM t0_definition; let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`; #echo MYSQLD_DATADIR: $MYSQLD_DATADIR; -# Dump the current definition of the table t1 to tmp1 -# This complicated method - let another mysqltest collect the output - is used -# because of two reasons +# Save the current definition of the table t1 # - SHOW CREATE TABLE t1 is at least currently most probably more reliable than # the corresponding SELECT on the INFORMATION_SCHEMA -# - SHOW CREATE TABLE .. cannot write its out put into a file like SELECT -let $show_file= $MYSQLD_DATADIR/test/tmp1; ---exec echo "SHOW CREATE TABLE t1; exit; " | $MYSQL_TEST > $show_file 2>&1 +let $show_create= `SHOW CREATE TABLE t1`; if ($do_file_tests) { # List the files belonging to the table t1 @@ -57,12 +53,13 @@ if (!$do_file_tests) # Insert the current definition of the table t1 into t0_definition eval INSERT INTO t0_definition SET state = 'old', - create_command = load_file('$show_file'), + create_command = "$show_create", file_list = @aux; # Print the create table statement into the protocol +# Added the concat to avoid changing the result files --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR '\r' '' -SELECT create_command FROM t0_definition WHERE state = 'old'; +SELECT concat('SHOW CREATE TABLE t1;\nTable\tCreate Table\n',create_command,'\n') as `create_command` FROM t0_definition WHERE state = 'old'; if ($do_file_tests) { # We stored the list of files, therefore printing the content makes sense === modified file 'mysql-test/suite/parts/inc/partition_layout_check2.inc' --- a/mysql-test/suite/parts/inc/partition_layout_check2.inc 2009-02-01 12:00:48 +0000 +++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc 2011-01-18 22:55:39 +0000 @@ -28,9 +28,8 @@ DELETE FROM t0_definition WHERE state = let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`; #echo MYSQLD_DATADIR: $MYSQLD_DATADIR; -# Dump the current definition of the table t1 to tmp1 -let $show_file= $MYSQLD_DATADIR/test/tmp1; ---exec echo "SHOW CREATE TABLE t1; exit; " | $MYSQL_TEST > $show_file 2>&1 +# Save the current definition of the table t1 +let $show_create= `SHOW CREATE TABLE t1`; if ($do_file_tests) { @@ -52,7 +51,7 @@ if (!$do_file_tests) # Insert the current definition of the table t1 into t0_definition eval INSERT INTO t0_definition SET state = 'new', - create_command = load_file('$show_file'), + create_command = "$show_create", file_list = @aux; # Print the old and new table layout, if they differ === modified file 'mysql-test/suite/parts/r/partition_recover_myisam.result' --- a/mysql-test/suite/parts/r/partition_recover_myisam.result 2009-08-29 21:29:47 +0000 +++ b/mysql-test/suite/parts/r/partition_recover_myisam.result 2011-01-18 22:55:39 +0000 @@ -1,4 +1,4 @@ -call mtr.add_suppression("./test/t1_will_crash"); +call mtr.add_suppression("t1_will_crash"); call mtr.add_suppression("Got an error from unknown thread, ha_myisam.cc"); CREATE TABLE t1_will_crash (a INT, KEY (a)) ENGINE=MyISAM; INSERT INTO t1_will_crash VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11); === modified file 'mysql-test/suite/parts/t/partition_debug_sync_innodb.test' --- a/mysql-test/suite/parts/t/partition_debug_sync_innodb.test 2010-03-17 14:10:41 +0000 +++ b/mysql-test/suite/parts/t/partition_debug_sync_innodb.test 2011-01-18 22:55:39 +0000 @@ -14,6 +14,7 @@ partition by range (a) insert into t1 values (1), (11), (21), (33); SELECT * FROM t1; SHOW CREATE TABLE t1; +--replace_result #p# #P# --list_files $MYSQLD_DATADIR/test SET DEBUG_SYNC='before_open_in_get_all_tables SIGNAL parked WAIT_FOR open'; @@ -36,6 +37,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 I disconnect con1; connection default; --reap +--replace_result #p# #P# --list_files $MYSQLD_DATADIR/test SHOW CREATE TABLE t1; SELECT * FROM t1; === modified file 'mysql-test/suite/parts/t/partition_recover_myisam.test' --- a/mysql-test/suite/parts/t/partition_recover_myisam.test 2009-08-29 21:29:47 +0000 +++ b/mysql-test/suite/parts/t/partition_recover_myisam.test 2011-01-18 22:55:39 +0000 @@ -1,6 +1,6 @@ # test the auto-recover (--myisam-recover) of partitioned myisam tables -call mtr.add_suppression("./test/t1_will_crash"); +call mtr.add_suppression("t1_will_crash"); call mtr.add_suppression("Got an error from unknown thread, ha_myisam.cc"); --source include/have_partition.inc @@ -20,6 +20,8 @@ FLUSH TABLES; let $MYSQLD_DATADIR= `select @@datadir`; --remove_file $MYSQLD_DATADIR/test/t1_will_crash.MYI --copy_file std_data/corrupt_t1.MYI $MYSQLD_DATADIR/test/t1_will_crash.MYI +--replace_result \\ / +--replace_regex /Table '.*data/Table './ SELECT * FROM t1_will_crash; DROP TABLE t1_will_crash; CREATE TABLE t1_will_crash (a INT, KEY (a)) @@ -33,5 +35,7 @@ FLUSH TABLES; --echo # head -c1024 t1#P#p1.MYI > corrupt_t1#P#p1.MYI --remove_file $MYSQLD_DATADIR/test/t1_will_crash#P#p1.MYI --copy_file std_data/corrupt_t1#P#p1.MYI $MYSQLD_DATADIR/test/t1_will_crash#P#p1.MYI +--replace_result \\ / +--replace_regex /Table '.*data/Table './ SELECT * FROM t1_will_crash; DROP TABLE t1_will_crash; === modified file 'mysql-test/suite/parts/t/partition_special_innodb.test' --- a/mysql-test/suite/parts/t/partition_special_innodb.test 2008-12-04 09:47:25 +0000 +++ b/mysql-test/suite/parts/t/partition_special_innodb.test 2011-01-18 22:55:39 +0000 @@ -58,8 +58,8 @@ ENGINE = InnoDB PARTITION BY HASH (a) PARTITIONS 2; -connect (con1,127.0.0.1,root,,test,$MASTER_MYPORT,); -connect (con2,127.0.0.1,root,,test,$MASTER_MYPORT,); +connect (con1, localhost, root,,); +connect (con2, localhost, root,,); --connection con1 SET autocommit=OFF; === modified file 'sql/item.h' --- a/sql/item.h 2011-01-04 13:13:20 +0000 +++ b/sql/item.h 2011-01-27 22:47:24 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2011, 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 === modified file 'sql/item_func.h' --- a/sql/item_func.h 2011-01-04 13:13:20 +0000 +++ b/sql/item_func.h 2011-01-27 22:47:24 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2011, 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 === modified file 'sql/item_timefunc.h' --- a/sql/item_timefunc.h 2010-12-22 14:45:17 +0000 +++ b/sql/item_timefunc.h 2011-01-28 12:37:39 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright (c) 2000, 2011, 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 === modified file 'sql/sql_partition.cc' --- a/sql/sql_partition.cc 2011-01-26 15:50:21 +0000 +++ b/sql/sql_partition.cc 2011-01-27 22:47:24 +0000 @@ -1,4 +1,4 @@ -/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc. +/* Copyright (c) 2005, 2011, 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 === modified file 'sql/table.cc' --- a/sql/table.cc 2010-12-01 11:20:46 +0000 +++ b/sql/table.cc 2011-01-27 22:47:24 +0000 @@ -1,4 +1,4 @@ -/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. +/* Copyright (c) 2000, 2011, 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 No bundle (reason: useless for push emails).