Skip to content

Commit cc3d104

Browse files
author
Mattias Jonsson
committed
merge
--BZR-- revision-id: [email protected] property-branch-nick: topush-5.5 testament3-sha1: 0b4359d6e41e24c4f385c145a9fb5c1064901ba9
2 parents c483e8a + 2a252db commit cc3d104

9 files changed

Lines changed: 19 additions & 19 deletions

‎mysql-test/suite/parts/inc/partition_layout_check1.inc‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,10 @@ DELETE FROM t0_definition;
2929
let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`;
3030
#echo MYSQLD_DATADIR: $MYSQLD_DATADIR;
3131

32-
# Dump the current definition of the table t1 to tmp1
33-
# This complicated method - let another mysqltest collect the output - is used
34-
# because of two reasons
32+
# Save the current definition of the table t1
3533
# - SHOW CREATE TABLE t1 is at least currently most probably more reliable than
3634
# the corresponding SELECT on the INFORMATION_SCHEMA
37-
# - SHOW CREATE TABLE .. cannot write its out put into a file like SELECT
38-
let $show_file= $MYSQLD_DATADIR/test/tmp1;
39-
--exec echo "SHOW CREATE TABLE t1; exit; " | $MYSQL_TEST > $show_file 2>&1
35+
let $show_create= `SHOW CREATE TABLE t1`;
4036
if ($do_file_tests)
4137
{
4238
# List the files belonging to the table t1
@@ -57,12 +53,13 @@ if (!$do_file_tests)
5753

5854
# Insert the current definition of the table t1 into t0_definition
5955
eval INSERT INTO t0_definition SET state = 'old',
60-
create_command = load_file('$show_file'),
56+
create_command = "$show_create",
6157
file_list = @aux;
6258

6359
# Print the create table statement into the protocol
60+
# Added the concat to avoid changing the result files
6461
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR '\r' ''
65-
SELECT create_command FROM t0_definition WHERE state = 'old';
62+
SELECT concat('SHOW CREATE TABLE t1;\nTable\tCreate Table\n',create_command,'\n') as `create_command` FROM t0_definition WHERE state = 'old';
6663
if ($do_file_tests)
6764
{
6865
# We stored the list of files, therefore printing the content makes sense

‎mysql-test/suite/parts/inc/partition_layout_check2.inc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ DELETE FROM t0_definition WHERE state = 'new';
2828
let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`;
2929
#echo MYSQLD_DATADIR: $MYSQLD_DATADIR;
3030

31-
# Dump the current definition of the table t1 to tmp1
32-
let $show_file= $MYSQLD_DATADIR/test/tmp1;
33-
--exec echo "SHOW CREATE TABLE t1; exit; " | $MYSQL_TEST > $show_file 2>&1
31+
# Save the current definition of the table t1
32+
let $show_create= `SHOW CREATE TABLE t1`;
3433

3534
if ($do_file_tests)
3635
{
@@ -52,7 +51,7 @@ if (!$do_file_tests)
5251

5352
# Insert the current definition of the table t1 into t0_definition
5453
eval INSERT INTO t0_definition SET state = 'new',
55-
create_command = load_file('$show_file'),
54+
create_command = "$show_create",
5655
file_list = @aux;
5756

5857
# Print the old and new table layout, if they differ

‎mysql-test/suite/parts/t/partition_recover_myisam.test‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ FLUSH TABLES;
2020
let $MYSQLD_DATADIR= `select @@datadir`;
2121
--remove_file $MYSQLD_DATADIR/test/t1_will_crash.MYI
2222
--copy_file std_data/corrupt_t1.MYI $MYSQLD_DATADIR/test/t1_will_crash.MYI
23+
--replace_result \\ /
24+
--replace_regex /Table '.*data/Table './
2325
SELECT * FROM t1_will_crash;
2426
DROP TABLE t1_will_crash;
2527
CREATE TABLE t1_will_crash (a INT, KEY (a))
@@ -33,5 +35,7 @@ FLUSH TABLES;
3335
--echo # head -c1024 t1#P#p1.MYI > corrupt_t1#P#p1.MYI
3436
--remove_file $MYSQLD_DATADIR/test/t1_will_crash#P#p1.MYI
3537
--copy_file std_data/corrupt_t1#P#p1.MYI $MYSQLD_DATADIR/test/t1_will_crash#P#p1.MYI
38+
--replace_result \\ /
39+
--replace_regex /Table '.*data/Table './
3640
SELECT * FROM t1_will_crash;
3741
DROP TABLE t1_will_crash;

‎mysql-test/suite/parts/t/partition_special_innodb.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ ENGINE = InnoDB
5858
PARTITION BY HASH (a)
5959
PARTITIONS 2;
6060

61-
connect (con1,127.0.0.1,root,,test,$MASTER_MYPORT,);
62-
connect (con2,127.0.0.1,root,,test,$MASTER_MYPORT,);
61+
connect (con1, localhost, root,,);
62+
connect (con2, localhost, root,,);
6363

6464
--connection con1
6565
SET autocommit=OFF;

‎sql/item.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef ITEM_INCLUDED
22
#define ITEM_INCLUDED
33

4-
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
4+
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
55
66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

‎sql/item_func.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef ITEM_FUNC_INCLUDED
22
#define ITEM_FUNC_INCLUDED
33

4-
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
4+
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
55
66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

‎sql/item_timefunc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef ITEM_TIMEFUNC_INCLUDED
22
#define ITEM_TIMEFUNC_INCLUDED
33

4-
/* Copyright (C) 2000-2006 MySQL AB
4+
/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved.
55
66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

‎sql/sql_partition.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2005-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
1+
/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by

‎sql/table.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
1+
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)