5 Commits

Author	SHA1	Message	Date
Alexander Nozdrin	a8ef1bafb1	Manual merge from mysql-next-mr. ... Conflicts: - sql/log_event.cc - sql/sql_class.h	2010-02-15 14:16:49 +03:00
Konstantin Osipov	74a853e40b	Merge next-mr -> next-4284. ... Post merge fixes. In sys_vars tests suite, whenever we use LOCK TABLE WRITE, adjust to lock the subject table indirecty via a view, to ensure that there the desired lock conflict in thr_lock.c is still taking place. If locked directly in LOCK TABLES list, thr_lock.c does not get involved. Adjust the thread wait state names in information_schema.processlist.	2010-02-03 14:09:36 +03:00
Horst.Hunger	c99be56de3	due to merge.	2010-01-20 14:22:49 +01:00
Horst Hunger	2aff261018	Reviewed fix for bug#37962 also including the revised result files for failing system variable tests.	2009-03-20 18:11:22 +01:00
Horst Hunger	357b500940	WL#4681: Took the system variable tests out of the main test suite, put them into "sys_vars", updated some reult files and tests.	2008-12-19 16:03:32 +01:00