summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2009-12-08 10:53:40 +0300
committerKonstantin Osipov <kostja@sun.com>2009-12-08 10:53:40 +0300
commita26d3f9963b2c5becd615a87ba4a249405e0bbf1 (patch)
treec1bb3f0906bc9146288bc5f5b7068a0d74c7ae07
parent356597c0fafa6472cd6e97ac550d49b8e07b97ec (diff)
downloadmariadb-git-a26d3f9963b2c5becd615a87ba4a249405e0bbf1.tar.gz
Backport of:
------------------------------------------------------------ revno: 2617.43.3 committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: 40188-6.0 timestamp: Thu 2009-05-07 13:15:54 +0200 message: Sort results as the file list of the database directory is not sorted (MY_DONT_SORT). (This is a follow-up fix for WL#4284). mysql-test/r/drop_debug.result: Update test case result. mysql-test/t/drop_debug.test: Sort warnings.
-rw-r--r--mysql-test/r/drop_debug.result4
-rw-r--r--mysql-test/t/drop_debug.test3
2 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/drop_debug.result b/mysql-test/r/drop_debug.result
index 75346b88bc6..f2c89034451 100644
--- a/mysql-test/r/drop_debug.result
+++ b/mysql-test/r/drop_debug.result
@@ -7,12 +7,16 @@ DROP DATABASE IF EXISTS mysql_test;
CREATE DATABASE mysql_test;
CREATE TABLE mysql_test.t1(a INT);
+CREATE TABLE mysql_test.t2(b INT);
+CREATE TABLE mysql_test.t3(c INT);
SET SESSION DEBUG = "+d,bug43138";
DROP DATABASE mysql_test;
Warnings:
Error 1051 Unknown table 't1'
+Error 1051 Unknown table 't2'
+Error 1051 Unknown table 't3'
SET SESSION DEBUG = "-d,bug43138";
diff --git a/mysql-test/t/drop_debug.test b/mysql-test/t/drop_debug.test
index 97ee5847d0a..63c85d9246b 100644
--- a/mysql-test/t/drop_debug.test
+++ b/mysql-test/t/drop_debug.test
@@ -17,11 +17,14 @@ DROP DATABASE IF EXISTS mysql_test;
--echo
CREATE DATABASE mysql_test;
CREATE TABLE mysql_test.t1(a INT);
+CREATE TABLE mysql_test.t2(b INT);
+CREATE TABLE mysql_test.t3(c INT);
--echo
SET SESSION DEBUG = "+d,bug43138";
--echo
+--sorted_result
DROP DATABASE mysql_test;
--echo