Commit ee1c5226 authored Nov 29, 2006 by unknown

Added back sql-bench directory, so that one can more easily run benchmarks on...

Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"


sql-bench/test-wisconsin.sh:
  Rename: BitKeeper/deleted/.del-test-wisconsin.sh~c0b86821b5f95f26 -> sql-bench/test-wisconsin.sh
sql-bench/test-transactions.sh:
  Rename: BitKeeper/deleted/.del-test-transactions.sh~c1c892f10c40caf -> sql-bench/test-transactions.sh
sql-bench/test-insert.sh:
  Rename: BitKeeper/deleted/.del-test-insert.sh~893bfac9dedb79a7 -> sql-bench/test-insert.sh
sql-bench/test-select.sh:
  Rename: BitKeeper/deleted/.del-test-select.sh~6d5cc770acf11be6 -> sql-bench/test-select.sh
sql-bench/test-create.sh:
  Rename: BitKeeper/deleted/.del-test-create.sh~f9a1ea38c191b17a -> sql-bench/test-create.sh
sql-bench/test-big-tables.sh:
  Rename: BitKeeper/deleted/.del-test-big-tables.sh~5b1b0c5fb623565a -> sql-bench/test-big-tables.sh
sql-bench/test-connect.sh:
  Rename: BitKeeper/deleted/.del-test-connect.sh~382a728c949ee075 -> sql-bench/test-connect.sh
sql-bench/test-ATIS.sh:
  Rename: BitKeeper/deleted/.del-test-ATIS.sh~e8ebff7086c95773 -> sql-bench/test-ATIS.sh
sql-bench/test-alter-table.sh:
  Rename: BitKeeper/deleted/.del-test-alter-table.sh~eba6cfa9972fcced -> sql-bench/test-alter-table.sh
sql-bench/innotest2b.sh:
  Rename: BitKeeper/deleted/.del-innotest2b.sh~7b99ece835e8dff3 -> sql-bench/innotest2b.sh
sql-bench/run-all-tests.sh:
  Rename: BitKeeper/deleted/.del-run-all-tests.sh~41d6da1cf211ee95 -> sql-bench/run-all-tests.sh
sql-bench/innotest2.sh:
  Rename: BitKeeper/deleted/.del-innotest2.sh~9c14df528285603 -> sql-bench/innotest2.sh
sql-bench/innotest2a.sh:
  Rename: BitKeeper/deleted/.del-innotest2a.sh~e01d016a7cafdc0b -> sql-bench/innotest2a.sh
sql-bench/innotest1a.sh:
  Rename: BitKeeper/deleted/.del-innotest1a.sh~c64f4610ae1e26fe -> sql-bench/innotest1a.sh
sql-bench/innotest1b.sh:
  Rename: BitKeeper/deleted/.del-innotest1b.sh~aafd0819ae84da7b -> sql-bench/innotest1b.sh
sql-bench/innotest1.sh:
  Rename: BitKeeper/deleted/.del-innotest1.sh~aa36bce09ca783c7 -> sql-bench/innotest1.sh
sql-bench/crash-me.sh:
  Rename: BitKeeper/deleted/.del-crash-me.sh~2fa881d0b40339c8 -> sql-bench/crash-me.sh
sql-bench/graph-compare-results.sh:
  Rename: BitKeeper/deleted/.del-graph-compare-results.sh~7e4e28b3591b4542 -> sql-bench/graph-compare-results.sh
sql-bench/copy-db.sh:
  Rename: BitKeeper/deleted/.del-copy-db.sh~e8116afb93144ccd -> sql-bench/copy-db.sh
sql-bench/compare-results.sh:
  Rename: BitKeeper/deleted/.del-compare-results.sh~a9e26e2644c694b3 -> sql-bench/compare-results.sh
sql-bench/bench-count-distinct.sh:
  Rename: BitKeeper/deleted/.del-bench-count-distinct.sh~a92f174271a831d7 -> sql-bench/bench-count-distinct.sh
sql-bench/as3ap.sh:
  Rename: BitKeeper/deleted/.del-as3ap.sh~f54eebbd8d34c9b6 -> sql-bench/as3ap.sh
sql-bench/Comments/Informix.crash-me:
  Rename: BitKeeper/deleted/.del-Informix.crash-me~51ab5b717cefe74 -> sql-bench/Comments/Informix.crash-me
sql-bench/Comments/postgres.crash-me:
  Rename: BitKeeper/deleted/.del-postgres.crash-me~eacac145c3e30f17 -> sql-bench/Comments/postgres.crash-me
sql-bench/Comments/Empress.crash-me:
  Rename: BitKeeper/deleted/.del-Empress.crash-me~bdaff0c68ce10f02 -> sql-bench/Comments/Empress.crash-me
sql-bench/Comments/Adabas.crash-me:
  Rename: BitKeeper/deleted/.del-Adabas.crash-me~ce88ba1a540971ac -> sql-bench/Comments/Adabas.crash-me
sql-bench/Comments/Access.crash-me:
  Rename: BitKeeper/deleted/.del-Access.crash-me~bb457ec282d939b6 -> sql-bench/Comments/Access.crash-me
sql-bench/Comments/postgres.benchmark:
  Rename: BitKeeper/deleted/.del-postgres.benchmark~4d30890732b784a -> sql-bench/Comments/postgres.benchmark
sql-bench/Comments/mysql.benchmark:
  Rename: BitKeeper/deleted/.del-mysql.benchmark~4d8729c0937456fc -> sql-bench/Comments/mysql.benchmark
sql-bench/Comments/FrontBase.benchmark:
  Rename: BitKeeper/deleted/.del-FrontBase.benchmark~217041ef18274c2e -> sql-bench/Comments/FrontBase.benchmark
sql-bench/Comments/interbase:
  Rename: BitKeeper/deleted/.del-interbase~cdad59622b4d6f3 -> sql-bench/Comments/interbase
sql-bench/uname.bat:
  Rename: BitKeeper/deleted/.del-uname.bat~a6d933d2ee9314c -> sql-bench/uname.bat
sql-bench/pwd.bat:
  Rename: BitKeeper/deleted/.del-pwd.bat~9b64050849abf51 -> sql-bench/pwd.bat
sql-bench/example.bat:
  Rename: BitKeeper/deleted/.del-example.bat~22d0170bccf0f030 -> sql-bench/example.bat
sql-bench/Makefile.am:
  Rename: BitKeeper/deleted/.del-Makefile.am~7b07da85b2e9375 -> sql-bench/Makefile.am
sql-bench/Data/ATIS/transport.txt:
  Rename: BitKeeper/deleted/.del-transport.txt~fa4ca40735f8354c -> sql-bench/Data/ATIS/transport.txt
sql-bench/Data/ATIS/time_zone.txt:
  Rename: BitKeeper/deleted/.del-time_zone.txt~4171f9ca732f65c0 -> sql-bench/Data/ATIS/time_zone.txt
sql-bench/Data/Wisconsin/tenk.data:
  Rename: BitKeeper/deleted/.del-tenk.data~6aeaebdd534e458e -> sql-bench/Data/Wisconsin/tenk.data
sql-bench/Data/Wisconsin/onek.data:
  Rename: BitKeeper/deleted/.del-onek.data~6cd1edaf596a7f7 -> sql-bench/Data/Wisconsin/onek.data
sql-bench/Data/ATIS/stop1.txt:
  Rename: BitKeeper/deleted/.del-stop1.txt~f09ba164ad44a288 -> sql-bench/Data/ATIS/stop1.txt
sql-bench/Data/ATIS/time_interval.txt:
  Rename: BitKeeper/deleted/.del-time_interval.txt~a1def62e267a59b2 -> sql-bench/Data/ATIS/time_interval.txt
sql-bench/Data/ATIS/stop.txt:
  Rename: BitKeeper/deleted/.del-stop.txt~31fb564e1f415e34 -> sql-bench/Data/ATIS/stop.txt
sql-bench/Data/ATIS/restriction.txt:
  Rename: BitKeeper/deleted/.del-restriction.txt~6ae208924617784a -> sql-bench/Data/ATIS/restriction.txt
sql-bench/Data/ATIS/state.txt:
  Rename: BitKeeper/deleted/.del-state.txt~9dd470ce14075b90 -> sql-bench/Data/ATIS/state.txt
sql-bench/Data/ATIS/restrict_class.txt:
  Rename: BitKeeper/deleted/.del-restrict_class.txt~2f741bf0ea498f84 -> sql-bench/Data/ATIS/restrict_class.txt
sql-bench/Data/ATIS/month_name.txt:
  Rename: BitKeeper/deleted/.del-month_name.txt~4c44f7a323d57d92 -> sql-bench/Data/ATIS/month_name.txt
sql-bench/Data/ATIS/restrict_carrier.txt:
  Rename: BitKeeper/deleted/.del-restrict_carrier.txt~925b5492f3f9cba3 -> sql-bench/Data/ATIS/restrict_carrier.txt
sql-bench/Data/ATIS/ground_service.txt:
  Rename: BitKeeper/deleted/.del-ground_service.txt~1087e477e86e84c -> sql-bench/Data/ATIS/ground_service.txt
sql-bench/Data/ATIS/food_service.txt:
  Rename: BitKeeper/deleted/.del-food_service.txt~66d95a150c28458 -> sql-bench/Data/ATIS/food_service.txt
sql-bench/Data/ATIS/flight_day.txt:
  Rename: BitKeeper/deleted/.del-flight_day.txt~76868d6d265d441e -> sql-bench/Data/ATIS/flight_day.txt
sql-bench/Data/ATIS/flight_fare.txt:
  Rename: BitKeeper/deleted/.del-flight_fare.txt~d7322593c8530487 -> sql-bench/Data/ATIS/flight_fare.txt
sql-bench/Data/ATIS/flight_class.txt:
  Rename: BitKeeper/deleted/.del-flight_class.txt~1801101474c29098 -> sql-bench/Data/ATIS/flight_class.txt
sql-bench/Data/ATIS/fconnection.txt:
  Rename: BitKeeper/deleted/.del-fconnection.txt~e0ef6a8b5560a713 -> sql-bench/Data/ATIS/fconnection.txt
sql-bench/Data/ATIS/flight.txt:
  Rename: BitKeeper/deleted/.del-flight.txt~e5065423760e99eb -> sql-bench/Data/ATIS/flight.txt
sql-bench/Data/ATIS/fare.txt:
  Rename: BitKeeper/deleted/.del-fare.txt~ea0652f490bc24a6 -> sql-bench/Data/ATIS/fare.txt
sql-bench/Data/ATIS/day_name.txt:
  Rename: BitKeeper/deleted/.del-day_name.txt~f813b215955d894c -> sql-bench/Data/ATIS/day_name.txt
sql-bench/Data/ATIS/dual_carrier.txt:
  Rename: BitKeeper/deleted/.del-dual_carrier.txt~a7dd776224fbd92b -> sql-bench/Data/ATIS/dual_carrier.txt
sql-bench/Data/ATIS/date_day.txt:
  Rename: BitKeeper/deleted/.del-date_day.txt~4e9a282fcf54cfd8 -> sql-bench/Data/ATIS/date_day.txt
sql-bench/Data/ATIS/compound_class.txt:
  Rename: BitKeeper/deleted/.del-compound_class.txt~d4a2f1b7f96340b9 -> sql-bench/Data/ATIS/compound_class.txt
sql-bench/Data/ATIS/connect_leg.txt:
  Rename: BitKeeper/deleted/.del-connect_leg.txt~f97b6e94e108bb36 -> sql-bench/Data/ATIS/connect_leg.txt
sql-bench/Data/ATIS/code_description.txt:
  Rename: BitKeeper/deleted/.del-code_description.txt~f9117373e438b0e2 -> sql-bench/Data/ATIS/code_description.txt
sql-bench/Data/ATIS/city.txt:
  Rename: BitKeeper/deleted/.del-city.txt~d96dd6d073344d2e -> sql-bench/Data/ATIS/city.txt
sql-bench/Data/ATIS/class_of_service.txt:
  Rename: BitKeeper/deleted/.del-class_of_service.txt~21f6b9848b8c76d -> sql-bench/Data/ATIS/class_of_service.txt
sql-bench/Data/ATIS/airport_service.txt:
  Rename: BitKeeper/deleted/.del-airport_service.txt~6ee6d5b852b3e38 -> sql-bench/Data/ATIS/airport_service.txt
sql-bench/Data/ATIS/airline.txt:
  Rename: BitKeeper/deleted/.del-airline.txt~a79f8eadf853f2c8 -> sql-bench/Data/ATIS/airline.txt
sql-bench/Data/ATIS/airport.txt:
  Rename: BitKeeper/deleted/.del-airport.txt~59c78514130e1f45 -> sql-bench/Data/ATIS/airport.txt
sql-bench/Data/ATIS/aircraft.txt:
  Rename: BitKeeper/deleted/.del-aircraft.txt~15e4de7ab37c92d3 -> sql-bench/Data/ATIS/aircraft.txt
sql-bench/TODO:
  Rename: BitKeeper/deleted/.del-TODO~cac6d7a63c426ae5 -> sql-bench/TODO
sql-bench/limits/sybase.cfg:
  Rename: BitKeeper/deleted/.del-sybase.cfg~c4636b12767b3f14 -> sql-bench/limits/sybase.cfg
sql-bench/limits/solid-nt4.cfg:
  Rename: BitKeeper/deleted/.del-solid-nt4.cfg~cca779f0c9e29d31 -> sql-bench/limits/solid-nt4.cfg
sql-bench/limits/solid.cfg:
  Rename: BitKeeper/deleted/.del-solid.cfg~5ae0e4342eadb0fb -> sql-bench/limits/solid.cfg
sql-bench/limits/pg.cfg:
  Rename: BitKeeper/deleted/.del-pg.cfg~db59cf39a5d417be -> sql-bench/limits/pg.cfg
sql-bench/limits/mysql.cfg:
  Rename: BitKeeper/deleted/.del-mysql.cfg~9cab20a8771b93cf -> sql-bench/limits/mysql.cfg
sql-bench/limits/oracle.cfg:
  Rename: BitKeeper/deleted/.del-oracle.cfg~affab21af8f438fd -> sql-bench/limits/oracle.cfg
sql-bench/limits/mysql-4.1.cfg:
  Rename: BitKeeper/deleted/.del-mysql-4.1.cfg~b6c5e74aefc99e3c -> sql-bench/limits/mysql-4.1.cfg
sql-bench/limits/mysql-3.23.cfg:
  Rename: BitKeeper/deleted/.del-mysql-3.23.cfg~3cf9d6be54b77a3c -> sql-bench/limits/mysql-3.23.cfg
sql-bench/limits/mysql-4.0.cfg:
  Rename: BitKeeper/deleted/.del-mysql-4.0.cfg~6c9d63c85b5ef574 -> sql-bench/limits/mysql-4.0.cfg
sql-bench/limits/mysql-3.22.cfg:
  Rename: BitKeeper/deleted/.del-mysql-3.22.cfg~e706f26a161175cd -> sql-bench/limits/mysql-3.22.cfg
sql-bench/limits/msql.cfg:
  Rename: BitKeeper/deleted/.del-msql.cfg~52710b12932cceb9 -> sql-bench/limits/msql.cfg
sql-bench/limits/ms-sql65.cfg:
  Rename: BitKeeper/deleted/.del-ms-sql65.cfg~6b9bc3c460dbee05 -> sql-bench/limits/ms-sql65.cfg
sql-bench/limits/mimer.cfg:
  Rename: BitKeeper/deleted/.del-mimer.cfg~234e6c1c3c47b612 -> sql-bench/limits/mimer.cfg
sql-bench/limits/ms-sql.cfg:
  Rename: BitKeeper/deleted/.del-ms-sql.cfg~1907964264d2786a -> sql-bench/limits/ms-sql.cfg
sql-bench/limits/interbase.cfg:
  Rename: BitKeeper/deleted/.del-interbase.cfg~c6951a0376cc6ff3 -> sql-bench/limits/interbase.cfg
sql-bench/limits/interbase-dialect3.cfg:
  Rename: BitKeeper/deleted/.del-interbase-dialect3.cfg~46277bdfc74c667a -> sql-bench/limits/interbase-dialect3.cfg
sql-bench/limits/interbase-superserver.cfg:
  Rename: BitKeeper/deleted/.del-interbase-superserver.cfg~22501198689243b0 -> sql-bench/limits/interbase-superserver.cfg
sql-bench/limits/interbase-dialect1.cfg:
  Rename: BitKeeper/deleted/.del-interbase-dialect1.cfg~659206b5b9a11036 -> sql-bench/limits/interbase-dialect1.cfg
sql-bench/limits/empress.cfg:
  Rename: BitKeeper/deleted/.del-empress.cfg~1f97f34d6560a499 -> sql-bench/limits/empress.cfg
sql-bench/limits/frontbase.cfg:
  Rename: BitKeeper/deleted/.del-frontbase.cfg~71369e9c002696e -> sql-bench/limits/frontbase.cfg
sql-bench/limits/db2.cfg:
  Rename: BitKeeper/deleted/.del-db2.cfg~711099b4d7906959 -> sql-bench/limits/db2.cfg
sql-bench/limits/access.cfg:
  Rename: BitKeeper/deleted/.del-access.cfg~5239ea3655b7bba0 -> sql-bench/limits/access.cfg
sql-bench/limits/access_odbc.cfg:
  Rename: BitKeeper/deleted/.del-access_odbc.cfg~34b4cf0eda56c4b1 -> sql-bench/limits/access_odbc.cfg
sql-bench/limits/Informix.cfg:
  Rename: BitKeeper/deleted/.del-Informix.cfg~b94188e1ececb51b -> sql-bench/limits/Informix.cfg
sql-bench/limits/Adabas.cfg:
  Rename: BitKeeper/deleted/.del-Adabas.cfg~343ed4e7f8b02111 -> sql-bench/limits/Adabas.cfg
sql-bench/README:
  Rename: BitKeeper/deleted/.del-README~b1aa0c1bf9f5eb5e -> sql-bench/README
BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed:
  Delete: sql-bench/Results/create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed
Makefile.am:
  Added back sql-bench
configure.in:
  Added back sql-bench
dbug/dbug.c:
  Fixed memory leak in _db_set()
  This is not a complete fix as we can still get memory leaks if we do any of the following:
  mysqld --debug --debug
  CAll DBUG_SET or DBUG_SET_INITIAL more than once in a program
  Use SET @@global.debug=xxxx
  
  At some point we should fix the above, but this is not critical for normal operation (only for debugging)
  
  Bug #24497 Valgrind warning: get_one_option
  
  Note that all changes to _db_set_ is only a variable access change, and can be ignored while reviewing the bug fix.
mysql-test/t/flush_read_lock_kill-master.opt:
  Added '+' to option, to be able to use this together with --debug
mysql-test/valgrind.supp:
  Removed warning that is now fixed
mysys/ptr_cmp.c:
  Fixed wrong pointer read (probably never used)
scripts/make_binary_distribution.sh:
  Added back sql_bench
sql/field.h:
  Removed class function that was identical in parent class
sql/mysqld.cc:
  Removed some calls to my_thread_init() / my_thread_end() that was not needed.
  Only call DBUG_SET_INITAL, not DBUG_SET
  (Fixes memory leak in dbug)
  Mark some code as deadcode
sql/net_serv.cc:
  Add information about from where error comes
sql-bench/bench-init.pl.sh:
  Cleaned up help text
sql-bench/server-cfg.sh:
  Don't write '/' after server name of no ssl version
sql-common/client.c:
  Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
  BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
sql/sql_parse.cc:
  Added comment
sql/table.h:
  Removed compiler warning

parent 76b4ccbd

Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
		@sql_union_dirs@ unittest storage plugin \
		@sql_server@ scripts @man_dirs@ tests \
		netware @libmysqld_dirs@ \
		mysql-test support-files @tools_dirs@ \
		mysql-test support-files sql-bench @tools_dirs@ \
		win

		DIST_SUBDIRS = $(SUBDIRS) BUILD

configure.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -2514,7 +2514,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
		dbug/Makefile scripts/Makefile include/Makefile dnl
		tests/Makefile Docs/Makefile support-files/Makefile dnl
		support-files/MacOSX/Makefile mysql-test/Makefile dnl
		mysql-test/ndb/Makefile netware/Makefile dnl
		mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile dnl
		include/mysql_version.h plugin/Makefile win/Makefile)

		AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" \|\| echo timestamp > stamp-h)

dbug/dbug.c

+122 −102

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@ static void DBUGCloseFile(CODE_STATE cs, FILE fp);
		/* Push current debug settings */
		static void PushState(CODE_STATE *cs);
		/* Free memory associated with debug state. */
		static void FreeState (CODE_STATE cs, struct settings state);
		static void FreeState (CODE_STATE cs, struct settings state, int free_state);
		/* Test for tracing enabled */
		static BOOLEAN DoTrace(CODE_STATE *cs);

		@@ -396,7 +396,7 @@ static CODE_STATE *code_state(void)
		*
		* SYNOPSIS
		*
		* VOID _db_push_(name)
		* VOID _process_(name)
		* char *name;
		*
		*/
		@@ -448,49 +448,51 @@ void _db_set_(CODE_STATE cs, const char control)
		{
		const char *end;
		int rel=0;
		struct settings *stack;

		get_code_state_or_return;
		stack= cs->stack;

		if (control[0] == '-' && control[1] == '#')
		control+=2;

		rel= control[0] == '+' \|\| control[0] == '-';
		if (!rel \|\| (!cs->stack->out_file && !cs->stack->next))
		{
		cs->stack->flags= 0;
		cs->stack->delay= 0;
		cs->stack->maxdepth= 0;
		cs->stack->sub_level= 0;
		cs->stack->out_file= stderr;
		cs->stack->prof_file= NULL;
		cs->stack->functions= NULL;
		cs->stack->p_functions= NULL;
		cs->stack->keywords= NULL;
		cs->stack->processes= NULL;
		}
		else if (!cs->stack->out_file)
		{
		cs->stack->flags= cs->stack->next->flags;
		cs->stack->delay= cs->stack->next->delay;
		cs->stack->maxdepth= cs->stack->next->maxdepth;
		cs->stack->sub_level= cs->stack->next->sub_level;
		strcpy(cs->stack->name, cs->stack->next->name);
		cs->stack->out_file= cs->stack->next->out_file;
		cs->stack->prof_file= cs->stack->next->prof_file;
		if (cs->stack->next == &init_settings)
		if ((!rel \|\| (!stack->out_file && !stack->next)))
		{
		stack->flags= 0;
		stack->delay= 0;
		stack->maxdepth= 0;
		stack->sub_level= 0;
		stack->out_file= stderr;
		stack->prof_file= NULL;
		stack->functions= NULL;
		stack->p_functions= NULL;
		stack->keywords= NULL;
		stack->processes= NULL;
		}
		else if (!stack->out_file)
		{
		stack->flags= stack->next->flags;
		stack->delay= stack->next->delay;
		stack->maxdepth= stack->next->maxdepth;
		stack->sub_level= stack->next->sub_level;
		strcpy(stack->name, stack->next->name);
		stack->out_file= stack->next->out_file;
		stack->prof_file= stack->next->prof_file;
		if (stack->next == &init_settings)
		{
		/* never share with the global parent - it can change under your feet */
		cs->stack->functions= ListCopy(init_settings.functions);
		cs->stack->p_functions= ListCopy(init_settings.p_functions);
		cs->stack->keywords= ListCopy(init_settings.keywords);
		cs->stack->processes= ListCopy(init_settings.processes);
		stack->functions= ListCopy(init_settings.functions);
		stack->p_functions= ListCopy(init_settings.p_functions);
		stack->keywords= ListCopy(init_settings.keywords);
		stack->processes= ListCopy(init_settings.processes);
		}
		else
		{
		cs->stack->functions= cs->stack->next->functions;
		cs->stack->p_functions= cs->stack->next->p_functions;
		cs->stack->keywords= cs->stack->next->keywords;
		cs->stack->processes= cs->stack->next->processes;
		stack->functions= stack->next->functions;
		stack->p_functions= stack->next->p_functions;
		stack->keywords= stack->next->keywords;
		stack->processes= stack->next->processes;
		}
		}

		@@ -507,158 +509,158 @@ void _db_set_(CODE_STATE cs, const char control)
		case 'd':
		if (sign < 0 && control == end)
		{
		if (!is_shared(cs->stack, keywords))
		FreeList(cs->stack->keywords);
		cs->stack->keywords=NULL;
		cs->stack->flags &= ~DEBUG_ON;
		if (!is_shared(stack, keywords))
		FreeList(stack->keywords);
		stack->keywords=NULL;
		stack->flags &= ~DEBUG_ON;
		break;
		}
		if (rel && is_shared(cs->stack, keywords))
		cs->stack->keywords= ListCopy(cs->stack->keywords);
		if (rel && is_shared(stack, keywords))
		stack->keywords= ListCopy(stack->keywords);
		if (sign < 0)
		{
		if (DEBUGGING)
		cs->stack->keywords= ListDel(cs->stack->keywords, control, end);
		stack->keywords= ListDel(stack->keywords, control, end);
		break;
		}
		cs->stack->keywords= ListAdd(cs->stack->keywords, control, end);
		cs->stack->flags \|= DEBUG_ON;
		stack->keywords= ListAdd(stack->keywords, control, end);
		stack->flags \|= DEBUG_ON;
		break;
		case 'D':
		cs->stack->delay= atoi(control);
		stack->delay= atoi(control);
		break;
		case 'f':
		if (sign < 0 && control == end)
		{
		if (!is_shared(cs->stack,functions))
		FreeList(cs->stack->functions);
		cs->stack->functions=NULL;
		if (!is_shared(stack,functions))
		FreeList(stack->functions);
		stack->functions=NULL;
		break;
		}
		if (rel && is_shared(cs->stack,functions))
		cs->stack->functions= ListCopy(cs->stack->functions);
		if (rel && is_shared(stack,functions))
		stack->functions= ListCopy(stack->functions);
		if (sign < 0)
		cs->stack->functions= ListDel(cs->stack->functions, control, end);
		stack->functions= ListDel(stack->functions, control, end);
		else
		cs->stack->functions= ListAdd(cs->stack->functions, control, end);
		stack->functions= ListAdd(stack->functions, control, end);
		break;
		case 'F':
		if (sign < 0)
		cs->stack->flags &= ~FILE_ON;
		stack->flags &= ~FILE_ON;
		else
		cs->stack->flags \|= FILE_ON;
		stack->flags \|= FILE_ON;
		break;
		case 'i':
		if (sign < 0)
		cs->stack->flags &= ~PID_ON;
		stack->flags &= ~PID_ON;
		else
		cs->stack->flags \|= PID_ON;
		stack->flags \|= PID_ON;
		break;
		#ifndef THREAD
		case 'g':
		if (OpenProfile(cs, PROF_FILE))
		{
		cs->stack->flags \|= PROFILE_ON;
		cs->stack->p_functions= ListAdd(cs->stack->p_functions, control, end);
		stack->flags \|= PROFILE_ON;
		stack->p_functions= ListAdd(stack->p_functions, control, end);
		}
		break;
		#endif
		case 'L':
		if (sign < 0)
		cs->stack->flags &= ~LINE_ON;
		stack->flags &= ~LINE_ON;
		else
		cs->stack->flags \|= LINE_ON;
		stack->flags \|= LINE_ON;
		break;
		case 'n':
		if (sign < 0)
		cs->stack->flags &= ~DEPTH_ON;
		stack->flags &= ~DEPTH_ON;
		else
		cs->stack->flags \|= DEPTH_ON;
		stack->flags \|= DEPTH_ON;
		break;
		case 'N':
		if (sign < 0)
		cs->stack->flags &= ~NUMBER_ON;
		stack->flags &= ~NUMBER_ON;
		else
		cs->stack->flags \|= NUMBER_ON;
		stack->flags \|= NUMBER_ON;
		break;
		case 'A':
		case 'O':
		cs->stack->flags \|= FLUSH_ON_WRITE;
		stack->flags \|= FLUSH_ON_WRITE;
		/* fall through */
		case 'a':
		case 'o':
		if (sign < 0)
		{
		if (!is_shared(cs->stack, out_file))
		DBUGCloseFile(cs, cs->stack->out_file);
		cs->stack->flags &= ~FLUSH_ON_WRITE;
		cs->stack->out_file= stderr;
		if (!is_shared(stack, out_file))
		DBUGCloseFile(cs, stack->out_file);
		stack->flags &= ~FLUSH_ON_WRITE;
		stack->out_file= stderr;
		break;
		}
		if (c == 'a' \|\| c == 'A')
		cs->stack->flags \|= OPEN_APPEND;
		stack->flags \|= OPEN_APPEND;
		else
		cs->stack->flags &= ~OPEN_APPEND;
		stack->flags &= ~OPEN_APPEND;
		if (control != end)
		DBUGOpenFile(cs, control, end, cs->stack->flags & OPEN_APPEND);
		DBUGOpenFile(cs, control, end, stack->flags & OPEN_APPEND);
		else
		DBUGOpenFile(cs, "-",0,0);
		break;
		case 'p':
		if (sign < 0 && control == end)
		{
		if (!is_shared(cs->stack,processes))
		FreeList(cs->stack->processes);
		cs->stack->processes=NULL;
		if (!is_shared(stack,processes))
		FreeList(stack->processes);
		stack->processes=NULL;
		break;
		}
		if (rel && is_shared(cs->stack, processes))
		cs->stack->processes= ListCopy(cs->stack->processes);
		if (rel && is_shared(stack, processes))
		stack->processes= ListCopy(stack->processes);
		if (sign < 0)
		cs->stack->processes= ListDel(cs->stack->processes, control, end);
		stack->processes= ListDel(stack->processes, control, end);
		else
		cs->stack->processes= ListAdd(cs->stack->processes, control, end);
		stack->processes= ListAdd(stack->processes, control, end);
		break;
		case 'P':
		if (sign < 0)
		cs->stack->flags &= ~PROCESS_ON;
		stack->flags &= ~PROCESS_ON;
		else
		cs->stack->flags \|= PROCESS_ON;
		stack->flags \|= PROCESS_ON;
		break;
		case 'r':
		cs->stack->sub_level= cs->level;
		stack->sub_level= cs->level;
		break;
		case 't':
		if (sign < 0)
		{
		if (control != end)
		cs->stack->maxdepth-= atoi(control);
		stack->maxdepth-= atoi(control);
		else
		cs->stack->maxdepth= 0;
		stack->maxdepth= 0;
		}
		else
		{
		if (control != end)
		cs->stack->maxdepth+= atoi(control);
		stack->maxdepth+= atoi(control);
		else
		cs->stack->maxdepth= MAXDEPTH;
		stack->maxdepth= MAXDEPTH;
		}
		if (cs->stack->maxdepth > 0)
		cs->stack->flags \|= TRACE_ON;
		if (stack->maxdepth > 0)
		stack->flags \|= TRACE_ON;
		else
		cs->stack->flags &= ~TRACE_ON;
		stack->flags &= ~TRACE_ON;
		break;
		case 'T':
		if (sign < 0)
		cs->stack->flags &= ~TIMESTAMP_ON;
		stack->flags &= ~TIMESTAMP_ON;
		else
		cs->stack->flags \|= TIMESTAMP_ON;
		stack->flags \|= TIMESTAMP_ON;
		break;
		case 'S':
		if (sign < 0)
		cs->stack->flags &= ~SANITY_CHECK_ON;
		stack->flags &= ~SANITY_CHECK_ON;
		else
		cs->stack->flags \|= SANITY_CHECK_ON;
		stack->flags \|= SANITY_CHECK_ON;
		break;
		}
		if (!*end)
		@@ -712,10 +714,10 @@ void _db_push_(const char *control)

		void _db_set_init_(const char *control)
		{
		CODE_STATE cs;
		bzero((char*) &cs,sizeof(cs));
		cs.stack=&init_settings;
		_db_set_(&cs, control);
		CODE_STATE tmp_cs;
		bzero((char*) &tmp_cs, sizeof(tmp_cs));
		tmp_cs.stack= &init_settings;
		_db_set_(&tmp_cs, control);
		}

		/*
		@@ -746,7 +748,7 @@ void _db_pop_()
		if (discard->next != NULL)
		{
		cs->stack= discard->next;
		FreeState(cs, discard);
		FreeState(cs, discard, 1);
		}
		}

		@@ -1426,16 +1428,15 @@ static void PushState(CODE_STATE *cs)
		*
		* static void FreeState (state)
		* struct state *state;
		* int free_state;
		*
		* DESCRIPTION
		*
		* Deallocates the memory allocated for various information in a
		* state.
		* state. If free_state is set, also free 'state'
		*
		*/
		static void FreeState (
		CODE_STATE *cs,
		struct settings *state)
		static void FreeState(CODE_STATE cs, struct settings state, int free_state)
		{
		if (!is_shared(state, keywords))
		FreeList(state->keywords);
		@@ -1449,6 +1450,7 @@ struct settings *state)
		DBUGCloseFile(cs, state->out_file);
		if (state->prof_file)
		DBUGCloseFile(cs, state->prof_file);
		if (free_state)
		free((char *) state);
		}

		@@ -1473,16 +1475,34 @@ struct settings *state)
		void _db_end_()
		{
		struct settings *discard;
		static struct settings tmp;
		CODE_STATE *cs=0;

		get_code_state_or_return;

		while((discard= cs->stack) != NULL) {
		while ((discard= cs->stack))
		{
		if (discard == &init_settings)
		break;
		cs->stack= discard->next;
		FreeState (cs, discard);
		FreeState(cs, discard, 1);
		}
		tmp= init_settings;

		/* Use mutex lock to make it less likely anyone access out_file */
		pthread_mutex_lock(&THR_LOCK_dbug);
		init_settings.flags= OPEN_APPEND;
		init_settings.out_file= stderr;
		init_settings.prof_file= stderr;
		init_settings.maxdepth= 0;
		init_settings.delay= 0;
		init_settings.sub_level= 0;
		init_settings.functions= 0;
		init_settings.p_functions= 0;
		init_settings.keywords= 0;
		init_settings.processes= 0;
		pthread_mutex_unlock(&THR_LOCK_dbug);
		FreeState(cs, &tmp, 0);
		}

mysql-test/t/flush_read_lock_kill-master.opt

+1 −1

Original line number	Diff line number	Diff line
		--loose-debug=d,make_global_read_lock_block_commit_loop
		--loose-debug=+d,make_global_read_lock_block_commit_loop

mysql-test/valgrind.supp

+0 −9

Original line number	Diff line number	Diff line
		@@ -469,15 +469,6 @@
		# Safe warnings, that may happen because of thread scheduling
		#

		{
		dbug initialization
		Memcheck:Leak
		fun:malloc
		fun:DbugMalloc
		fun:ListAdd
		fun:_db_set_
		}

		{
		dbug initialization by kill_server
		Memcheck:Leak