diff options
| author | unknown <monty@mysql.com> | 2003-12-21 19:39:32 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-21 19:39:32 +0200 |
| commit | d31c6628e1494dd561f96cfb8a1fbfde17fc8ed4 (patch) | |
| tree | 82780d2f52e09f3ef112e35fc6f6b3e1dadc3a56 /mysql-test/mysql-test-run.sh | |
| parent | 9e56a0a7711e1f6f2b234db54b3e3d2004069bbf (diff) | |
| download | mariadb-git-d31c6628e1494dd561f96cfb8a1fbfde17fc8ed4.tar.gz | |
Portability fixes found during 5.0 test compilation
Fixed bug in ORDER BY on a small column (Bug #2147)
Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
client/mysqltest.c:
Added handling of error on query send
(Needed for init_connection.test)
mysql-test/mysql-test-run.sh:
Added tracing of mysqldump and mysqlbinlog
mysql-test/r/init_connect.result:
Updated tests
mysql-test/r/order_by.result:
Added test for bug filesort bug
mysql-test/t/init_connect-master.opt:
Added proper quoting (for Solaris and OSF)
mysql-test/t/init_connect.test:
Portability fix
mysql-test/t/order_by.test:
Added test for bug #2147 (bug in filesort)
sql/filesort.cc:
Fixed bug in filesort (Bug #2147)
sql/item.h:
Clear 'fixed' on cleanup (For prepared statements)
sql/item_func.cc:
Protect mutex destroy.
(Fixed error from pthread_mutex_destroy() when one had wrong errmsg file)
sql/log_event.cc:
Portability fix
sql/sql_class.h:
Fixed compiler warning
sql/sql_prepare.cc:
Portability fix. (Some compilers doesn't support jump over variables declared in for())
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index c3bba8d7a70..265ff036998 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -198,6 +198,8 @@ USER_TEST= EXTRA_MASTER_OPT="" EXTRA_MYSQL_TEST_OPT="" +EXTRA_MYSQLDUMP_OPT="" +EXTRA_MYSQLBINLOG_OPT="" USE_RUNNING_SERVER="" DO_GCOV="" DO_GDB="" @@ -373,6 +375,10 @@ while test $# -gt 0; do --debug=d:t:i:A,$MYSQL_TEST_DIR/var/log/slave.trace" EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT \ --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqltest.trace" + EXTRA_MYSQLDUMP_OPT="$EXTRA_MYSQLDUMP_OPT \ + --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqldump.trace" + EXTRA_MYSQLBINLOG_OPT="$EXTRA_MYSQLBINLOG_OPT \ + --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlbinlog.trace" ;; --fast) FAST_START=1 @@ -490,8 +496,8 @@ else fi fi -MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK" -MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR" +MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK $EXTRA_MYSQLDUMP_OPT" +MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT" export MYSQL_DUMP export MYSQL_BINLOG |