summaryrefslogtreecommitdiff
path: root/mysql-test/include/ps_query.inc
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-10-31 12:25:08 +0100
committerunknown <msvensson@neptunus.(none)>2005-10-31 12:25:08 +0100
commit91faec36f9e2591e09a602d6064e9a67dae69ded (patch)
treeaef130518970c644ae37873562a9661e38c6e992 /mysql-test/include/ps_query.inc
parent8ba28aa38b6ac71b35da8eae28949e276ff4c4f3 (diff)
downloadmariadb-git-91faec36f9e2591e09a602d6064e9a67dae69ded.tar.gz
WL#2930 Adding view and cursor 'protocols' to mysqltest
- Cleanup of mysqltest.c before extending it client/mysqltest.c: Cleanup functions run_query_* before adding new functionality. Break out common functions used in both run_query_stmt and run_query_normal Move functionality for all run_query_* calls into run_query Since the normal way of handling an unepected error is to call die(which will never return), remove all return values from functions that does not return. Add comments. Remove unused vars. Cleanup... Removed oboslete syntax @<file_name>, "require" or "result" should be used. mysql-test/include/master-slave.inc: remove obsolete syntax @, use "require" command mysql-test/include/ps_query.inc: Remove this comment, mysqltest will now produce output. Old mysqltest didn't return any output since command starting with @ was treated as a require. Uggh. mysql-test/r/mysqltest.result: Update test result mysql-test/r/ps_2myisam.result: Update test result mysql-test/r/ps_3innodb.result: Update test result mysql-test/r/ps_4heap.result: Update test result mysql-test/r/ps_5merge.result: Update test result mysql-test/r/ps_6bdb.result: Update test result mysql-test/r/ps_7ndb.result: Update test result mysql-test/t/alias.test: Remove --disable/enable_ps_protocol, only used to mask bugs in mysqltest mysql-test/t/group_by.test: Remove --disable/enable_ps_protocol, only used to mask bugs in mysqltest mysql-test/t/mysqltest.test: Add test for "Missing delimiter until eof" mysql-test/t/union.test: Remove --disable/enable_ps_protocol, "select found_rows" works with ps_protocol now!
Diffstat (limited to 'mysql-test/include/ps_query.inc')
-rw-r--r--mysql-test/include/ps_query.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/include/ps_query.inc b/mysql-test/include/ps_query.inc
index 27a86f88231..e96d666eaec 100644
--- a/mysql-test/include/ps_query.inc
+++ b/mysql-test/include/ps_query.inc
@@ -52,7 +52,6 @@ execute stmt1;
##### parameter used for keyword like SELECT (must fail)
set @arg00='SELECT' ;
-# mysqltest gives no output for the next statement, Why ??
--error 1064
@arg00 a from t1 where a=1;
--error 1064