From 654395b051fdd5e6c472a19440962174324fc658 Mon Sep 17 00:00:00 2001
From: unknown <bar@mysql.com/bar.intranet.mysql.r18.ru>
Date: Tue, 21 Nov 2006 12:09:14 +0400
Subject: Prepare to merge "backport of bug#13926 from 5.0 to 4.1" back into
 5.0: Moving tests into their new place into 4.1 tests section

---
 mysql-test/t/mysqldump.test | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'mysql-test/t/mysqldump.test')

diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 72aad395ec0..47a3ff52aae 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -713,6 +713,25 @@ create table t1 (a int);
 --exec $MYSQL_DUMP --skip-comments --force test t1 --where='xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' 2>&1
 drop table t1;
 
+--echo #
+--echo # BUG#13926: --order-by-primary fails if PKEY contains quote character
+--echo #
+
+--disable_warnings
+DROP TABLE IF EXISTS `t1`;
+CREATE TABLE `t1` (
+  `a b` INT,
+  `c"d` INT,
+  `e``f` INT,
+  PRIMARY KEY (`a b`, `c"d`, `e``f`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+insert into t1 values (0815, 4711, 2006);
+
+--exec $MYSQL_DUMP --skip-comments --compatible=ansi --order-by-primary test t1
+--exec $MYSQL_DUMP --skip-comments --order-by-primary test t1
+DROP TABLE `t1`;
+--enable_warnings
+
 --echo End of 4.1 tests
 
 --echo #
@@ -1393,25 +1412,6 @@ drop user myDB_User;
 drop database mysqldump_myDB;
 use test;
 
---echo #
---echo # BUG#13926: --order-by-primary fails if PKEY contains quote character
---echo #
-
---disable_warnings
-DROP TABLE IF EXISTS `t1`;
-CREATE TABLE `t1` (
-  `a b` INT,
-  `c"d` INT,
-  `e``f` INT,
-  PRIMARY KEY (`a b`, `c"d`, `e``f`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-insert into t1 values (0815, 4711, 2006);
-
---exec $MYSQL_DUMP --skip-comments --compatible=ansi --order-by-primary test t1
---exec $MYSQL_DUMP --skip-comments --order-by-primary test t1
-DROP TABLE `t1`;
---enable_warnings
-
 --echo #
 --echo # Bug #19745: mysqldump --xml produces invalid xml
 --echo #
-- 
cgit v1.2.1