4 Commits

Author	SHA1	Message	Date
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	667a004c53	Reviewed patch for Bug#39862.	2009-03-19 12:21:38 +01:00
Luis Soares	f7a24d72dc	merge: 5.1 -> 5.1-rpl-merge ... conflicts: Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test	2009-01-29 17:59:46 +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