summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-09-14 15:15:36 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2011-09-14 15:15:36 +0200
commita238e6ada252aaf8c0f9f146ec46c15ea13309e7 (patch)
treea99d3c540d0a643fd383ee8311dd153d785846d3 /mysql-test/r/mysqltest.result
parentb01b7dc2486ea5744d5f1c4b314f25d20c5d809d (diff)
downloadmariadb-git-a238e6ada252aaf8c0f9f146ec46c15ea13309e7.tar.gz
Bug #12956584 MYSQLTEST: --ENABLE_X OR --DISABLE_X APPLYING ONLY TO NEXT COMMAND/STMT
Added a keyword ONCE to add to those commands Some internal tables to keep track of which properties are temporarily overriden Added tests in mysqltest.test Updates to other tests will be done later
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result19
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 9d000e6f782..2dfb0e88f6e 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -160,6 +160,25 @@ after_--enable_abort_on_error
select 3 from t1 ;
ERROR 42S02: Table 'test.t1' doesn't exist
mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146: 'Table 'test.t1' doesn't exist', instead of 1064...
+garbage;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1
+select 2;
+select 3;
+3
+3
+select 5;
+ERROR 42S02: Table 'test.t1' doesn't exist
+select 7;
+7
+7
+mysqltest: At line 1: End of line junk detected: "OCNE"
+connect con1,localhost,root,,;
+select 5 from t1;
+lower
+case
+name
+abc
+xyz
hello
hello
;;;;;;;;