10 commits

Author	SHA1	Message	Date
Nirbhay Choubey	5f3cfbb59d	Updated mysqld--help test and result (MDEV-6717, MDEV-6659).	2014-09-16 12:55:29 -04:00
Jan Lindström	071edcfea0	Merge with MariaDB 5.5.34.	2013-11-25 17:14:08 +02:00
Sergei Golubchik	d042e61f8e	MDEV-5054 Failing test(s): main.mysqld--help sys_vars.character_sets_dir_basic ... fix tests where a path was used as a regex. revert changes to sys_vars.character_sets_dir_basic - we don't run it on windows anyway	2013-11-11 09:31:02 +01:00
Sergei Golubchik	909775a762	mariadb-5.5.33 merge	2013-09-18 12:00:23 +02:00
Sergei Golubchik	6755944d08	remove PBXT	2013-08-30 11:25:49 +02:00
Seppo Jaakola	bd0eae595f	References: MDEV-4572 - merge with mariaDB 5.5.31 ... bzr merge lp:maria/5.5 -rtag:mariadb-5.5.31 Text conflict in cmake/cpack_rpm.cmake Text conflict in debian/dist/Debian/control Text conflict in debian/dist/Ubuntu/control Text conflict in sql/CMakeLists.txt Conflict adding file sql/db.opt. Moved existing file to sql/db.opt.moved. Conflict adding file sql/db.opt.moved. Moved existing file to sql/db.opt.moved.moved. Text conflict in sql/mysqld.cc Text conflict in support-files/mysql.spec.sh 8 conflicts encountered.	2013-05-26 11:26:58 +03:00
Sergei Golubchik	01fd55ccae	MDEV-249 QUERY CACHE INFORMATION	2013-03-20 20:56:14 +01:00
Elena Stepanova	c40abe9df0	MDEV-508 (Wrong MTR result files in MariaDB-Galera)	2013-02-03 04:03:08 +04:00
Sergei Golubchik	ffc82ab606	update test cases and results	2012-12-20 12:34:37 +01:00
Sergei Golubchik	e293bdb2c1	instead of having win/notwin tests that only differ in results, ... use one test with two combinations (win/unix), where only one is enabled. Apply this technique to mysqld--help.	2012-02-23 09:24:11 +01:00

Renamed from mysql-test/include/mysqld--help.inc (Browse further)