diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-19 16:00:12 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-19 16:00:12 +0300 |
| commit | aa900a5ecee00b40e5add6c88805587a850b057a (patch) | |
| tree | 7e42515465680bf9479f44de0c710044aa122610 /mysql-test | |
| parent | 755e72a0f55b593cf930ae9bd69998f82b70d5cf (diff) | |
| download | mariadb-git-aa900a5ecee00b40e5add6c88805587a850b057a.tar.gz | |
After merge fixes + bugs from last merge
mysql-test/mysql-test-run.sh:
Use --skip-bdb with valgrind (as bdb tables causes valgrind to hang)
Fix --ddd option
mysql-test/t/union.test:
After merge fix
sql/item.cc:
Fixed typo
sql/log_event.cc:
Move current_tablenr to open_tables()
sql/protocol.h:
Fixed wrong memory reference
sql/set_var.cc:
After merge fix
sql/slave.cc:
Reset thd->lex.current_select before execute
sql/sql_base.cc:
Move current_tablenr to open_tables()
sql/sql_class.cc:
Move current_tablenr to open_tables()
Add missing update_charset()
sql/sql_parse.cc:
Move current_tablenr to open_tables()
Simple cleanup
sql/table.cc:
Code cleanup
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 6 | ||||
| -rw-r--r-- | mysql-test/t/union.test | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 8800055a3bb..874abdc0c86 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -344,8 +344,8 @@ while test $# -gt 0; do ;; --valgrind) VALGRIND="valgrind --alignment=8 --leak-check=yes --num-callers=16" - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc" + EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc --skip-bdb" + EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc --skip-bdb" SLEEP_TIME_AFTER_RESTART=10 SLEEP_TIME_FOR_DELETE=60 USE_RUNNING_SERVER="" @@ -998,7 +998,7 @@ start_slave() if [ x$DO_DDD = x1 ] then - $ECHO "set args $master_args" > $GDB_SLAVE_INIT + $ECHO "set args $slave_args" > $GDB_SLAVE_INIT manager_launch $slave_ident ddd -display $DISPLAY --debugger \ "gdb -x $GDB_SLAVE_INIT" $SLAVE_MYSQLD elif [ x$DO_GDB = x1 ] diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index c5aa725a459..3506c713907 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -23,7 +23,7 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g (select a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 4; (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1); (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc; ---error 1248 +--error 1249 (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by t1.b; explain (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc; (select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2; |