diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-07-18 15:00:45 +0300 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-07-18 15:00:45 +0300 |
| commit | 5f5a3cf1aa6738a68ecde36dc25f696b0f25c827 (patch) | |
| tree | a42a867611895fc20c8b0c1573e95ade5239651a /mysql-test | |
| parent | 516312dda6fedb268e28bcc233f62da5591c9fed (diff) | |
| parent | 88d66418c8fb2fbd6b60968d1ad8962b2af56232 (diff) | |
| download | mariadb-git-5f5a3cf1aa6738a68ecde36dc25f696b0f25c827.tar.gz | |
merge of 38158 to 5.1-bugteam
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/client_xml.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/mysql.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/client_xml.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/mysql_delimiter.sql | 6 |
4 files changed, 4 insertions, 8 deletions
diff --git a/mysql-test/r/client_xml.result b/mysql-test/r/client_xml.result index 6e9857c2d6d..aa4bdb2bd61 100644 --- a/mysql-test/r/client_xml.result +++ b/mysql-test/r/client_xml.result @@ -1,5 +1,6 @@ set @old_concurrent_insert= @@global.concurrent_insert; set @@global.concurrent_insert= 0; +drop table if exists t1; create table t1 ( `a&b` int, `a<b` int, diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 6fe35d5c9f9..a4d96c1c243 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -38,8 +38,6 @@ t2 t3 Tables_in_test t1 -delimiter -1 _ Test delimiter : from command line a diff --git a/mysql-test/t/client_xml.test b/mysql-test/t/client_xml.test index 889861ad4a4..739b56f5ab1 100644 --- a/mysql-test/t/client_xml.test +++ b/mysql-test/t/client_xml.test @@ -6,6 +6,9 @@ # the data is actually in the table). set @old_concurrent_insert= @@global.concurrent_insert; set @@global.concurrent_insert= 0; +--disable_warnings +drop table if exists t1; +--enable_warnings # Test of the xml output of the 'mysql' and 'mysqldump' clients -- makes # sure that basic encoding issues are handled properly diff --git a/mysql-test/t/mysql_delimiter.sql b/mysql-test/t/mysql_delimiter.sql index 917401275a2..533ac2ce093 100644 --- a/mysql-test/t/mysql_delimiter.sql +++ b/mysql-test/t/mysql_delimiter.sql @@ -61,12 +61,6 @@ show tables// delimiter ; # Reset delimiter # -# Bug #33812: mysql client incorrectly parsing DELIMITER -# -select a as delimiter from t1 -delimiter ; # Reset delimiter - -# # Bug #36244: MySQL CLI doesn't recognize standalone -- as comment # before DELIMITER statement # |