mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
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
This commit is contained in:
@ -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 ]
|
||||
|
Reference in New Issue
Block a user