mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

WL#2930 Adding view and cursor 'protocols' to mysqltest

Browse source 
- 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!
This commit is contained in:
unknown 2005-10-31 12:25:08 +01:00
commit 91faec36f9
14 changed files with 569 additions and 638 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mysql-test/t/mysqltest.test
View file

@ -364,6 +364,15 @@ select 3 from t1 ;
--error 1
--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1
#
# Missing delimiter until eof
# The comment will be "sucked into" the sleep command since
# delimiter is missing
--system echo "sleep 7" > var/log/mysqltest.sql
--system echo "# Another comment" >> var/log/mysqltest.sql
--error 1
--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1
#
# Extra delimiter
#