database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code 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
parent 8ba28aa38b
commit 91faec36f9
14 changed files with 761 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/include/master-slave.inc
View File

@@ -8,7 +8,8 @@ connection slave;
--disable_warnings
stop slave;
--enable_warnings
@r/slave-stopped.result show status like 'Slave_running';
--require r/slave-stopped.result
show status like 'Slave_running';
connection master;
--disable_warnings
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
@@ -21,7 +22,8 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
--enable_warnings
start slave;
@r/slave-running.result show status like 'Slave_running';
--require r/slave-running.result
show status like 'Slave_running';
# Set the default connection to 'master'
connection master;