diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-25 23:29:01 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-25 23:29:01 -0700 |
| commit | c3cc5856a5d9ee8fa3d01207613f961ae110b2cd (patch) | |
| tree | a230abbd46e3341756e3e5629a69736b6a057239 /mysql-test/create-test-result | |
| parent | 80db9fb3c95519383bbae73aa8cfc0773bf7c40f (diff) | |
| download | mariadb-git-c3cc5856a5d9ee8fa3d01207613f961ae110b2cd.tar.gz | |
Fixed temp tables to work with replication. It will not work if you stop the slave
while slave thread has temp tables - not hard to fix though, but it is time to go to bed
added a new test case for temp table replication and Slave_open_temp_tables
status variable.
Misc fixes
client/mysqltest.c:
added disconnect command
mysql-test/create-test-result:
fixed bugs so it actually works
mysql-test/t/include/master-slave.inc:
establish alternate connections to master and slave
sql/mysql_priv.h:
Slave_open_temp_tables
sql/mysqlbinlog.cc:
fixed a bug in reading local binlogs
sql/mysqld.cc:
added Slave_open_temp_tables status variable
sql/slave.cc:
fixed freed memory reference in the error message
sql/sql_class.cc:
slave_proxy_id
sql/sql_class.h:
slave_proxy_id
sql/sql_parse.cc:
small optimization - reorder eval in &&
BitKeeper/etc/ignore:
Added mysql-test/r/3.23/rpl000001.b.result.reject mysql-test/r/3.23/rpl000012.result.reject to the ignore list
sql/sql_table.cc:
added THD arg to rename_temporary_table
sql/unireg.h:
the table_cache_key is now 4 bytes longer
Diffstat (limited to 'mysql-test/create-test-result')
| -rwxr-xr-x | mysql-test/create-test-result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/create-test-result b/mysql-test/create-test-result index 08ca7a71921..24c3d175303 100755 --- a/mysql-test/create-test-result +++ b/mysql-test/create-test-result @@ -6,7 +6,7 @@ # to start mysqld yourself and run mysqltest -r RESULT_DIR=r/3.23 -if [ -z $EDITOR] then; +if [ -z $EDITOR] ; then EDITOR=vi fi @@ -26,7 +26,7 @@ test_name=$1 [ -z $test_name ] && usage -result_file=$result_dir/$test_name.result +result_file=$RESULT_DIR/$test_name.result [ -f $result_file ] && die "result file $result_file has already been created" @@ -39,11 +39,11 @@ reject_file=$result_file.reject if [ -f $reject_file ] ; then echo "Below are the contents of the reject file:" echo "-----start---------------------" - cat $result_file. + cat $reject_file echo "-----end-----------------------" echo "Is this the output you expected from your test case?(y/n)[n]" read yes_no - if [ x$yes_no = xy ] then; + if [ x$yes_no = xy ] ; then echo "Press any key to edit it in $EDITOR, or Ctrl-C to abort" read junk $EDITOR $reject_file |