delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge 5.3 -> 5.5	Alexander Barkov	2013-11-13	1	-0/+7
\|\
\| *	Merge 5.2 -> 5.3	Alexander Barkov	2013-11-13	1	-0/+7
\| \|\
\| \| *	Merge 5.1 -> 5.2	Alexander Barkov	2013-11-13	1	-0/+7
\| \| \|\
\| \| \| *	MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and above	Alexander Barkov	2013-11-13	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow only one level of symlink recursion in mysql_tzdata_to_sql, to avoid infinite loops.
* \| \| \|	MDEV-4977 ./mysql-test/mysql-test-run.pl not identifying mariadb version	Sergei Golubchik	2013-11-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	quote the path when using it in a regex - the path might contain wildcards (e.g. +)
* \| \| \|	mysql-5.5.33 merge	Sergei Golubchik	2013-09-06	1	-1/+11
\|\ \ \ \
\| * \| \| \|	Bug #16917425 -DBUILD_CONFIG=MYSQL_RELEASE -DWITH_DEBUG=ON FAILS 4 AND ↵	Olav Sandstaa	2013-06-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SKIPS 27 MTR TESTS Revert fix since it caused mtr tests to not run in pushbuild.
\| * \| \| \|	Bug #16917425 -DBUILD_CONFIG=MYSQL_RELEASE -DWITH_DEBUG=ON FAILS 4 AND ↵	sayantan dutta	2013-06-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SKIPS 27 MTR TESTS
\| * \| \| \|	Bug 16813007 5.1 => 5.5	sayantan dutta	2013-05-16	1	-1/+11
\| \|\ \ \ \
\| \| * \| \| \|	Bug #16813007 - MTR IS NOT TAKING MYSQLTEST CLIENT USING THE ENV VARIABLE ↵	sayantan dutta	2013-05-16	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MYSQL_TEST
\| \| * \| \| \|	BUG#16247322-MTR NOT RUNNING SYS_VARS TEST SUITE FOR 5.1	Venkatesh Duggirala	2013-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reverting back the previous changes as they are causing issues in PB2.
\| \| * \| \| \|	Bug#16247322- MTR NOT RUNNING SYS_VARS TEST	Venkatesh Duggirala	2013-02-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SUITE FOR 5.1 SYS_VARS suite is not enabled in MTR by default run. Enabling it with this check-in. mysql-test/suite/sys_vars/t/disabled.def: Till the bugs are fixed, disabling the failed test scripts
* \| \| \| \| \|	mysql-5.5.32 merge	Sergei Golubchik	2013-07-16	1	-3/+3
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Bug #16403186 - MTR ON WINDOWS SHOULD NOT TRY TO START CDB IF RUNNING WITH ↵	sayantan dutta	2013-03-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PARALLEL
* \| \| \| \| \|	Fixed that SHOW PROCESSLIST and information_schema.processlist uses the ↵	Michael Widenius	2013-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	right length for user names. Fixed some failing tests mysql-test/mysql-test-run.pl: Removed warning from mysql-test-run mysql-test/r/create.result: Updated result mysql-test/r/log_slow.result: Fixed failing test mysql-test/suite/funcs_1/r/is_columns_is.result: Updated result mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result: Updated result mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Updated result mysql-test/t/log_slow.test: Ensure variables are properly reset at end of test sql/sql_show.cc: Fixed max length for user names
* \| \| \| \| \|	mysql-5.5.31 merge	Sergei Golubchik	2013-05-07	1	-4/+23
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	13625278 5.1 => 5.5	unknown	2013-02-06	1	-0/+1
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	BUG #13625278 - PB2 SHOULD PROVIDE MORE USEFUL INFORMATION FOR TIMEOUTS	unknown	2013-02-06	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	13625278 5.1=> 5.5	unknown	2013-02-05	1	-1/+17
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	BUG #13625278 - PB2 SHOULD PROVIDE MORE USEFUL INFORMATION FOR TIMEOUTS	unknown	2013-02-05	1	-1/+17
\| \| \| \| \| \|
\| \| * \| \| \|	Bug #16190704: MTR STILL LOSES THE FAILED RUN LOGS AT RETRY-FAIL	unknown	2013-02-04	1	-3/+5
\| \| \| \| \| \|
\| * \| \| \| \|	BUG #16190704 - MTR STILL LOSES THE FAILED RUN LOGS AT RETRY-FAIL	unknown	2013-02-01	1	-3/+5
\| \| \| \| \| \|
* \| \| \| \| \|	MDEV-3882: .deb versions lower than upstream repo, causing install failure	unknown	2013-04-16	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The official Debian Wheezy MySQL packages have versions like 5.5.30+dfsg-xxx. Such version is larger than 5.5.30-yyy, so apt prefers it. So use instead 5.5.30+maria-yyy, which is larger and can be pulled in automatically by apt. Also included are a couple of fixes for test failures in buildbot.
* \| \| \| \| \|	5.3->5.5 merge	Sergei Golubchik	2013-02-28	1	-0/+1
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	5.2 -> 5.3	Sergei Golubchik	2013-02-28	1	-0/+5
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	5.1 -> 5.2 merge	Sergei Golubchik	2013-02-28	1	-0/+5
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| \| * \| \|	mysql-5.1 merge	Sergei Golubchik	2013-02-28	1	-0/+4
\| \| \| \|\ \ \ \| \| \| \| \| \|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysys/errors.c: revert upstream's fix. use a much simpler one mysys/my_write.c: revert upstream's fix. use a simpler one sql/item_xmlfunc.cc: useless, but ok sql/mysqld.cc: simplify upstream's fix storage/heap/hp_delete.c: remove upstream's fix. we'll use a much less expensive approach.
\| \| \| * \| \|	MDEV-4169: mysql-test-run doesn't strip expected warnings (setrlimit)	Elena Stepanova	2013-02-14	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	merge	Sergei Golubchik	2012-04-05	1	-2/+2
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	merge	Sergei Golubchik	2012-04-05	1	-2/+2
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	mysql-5.1.62 merge	Sergei Golubchik	2012-04-05	1	-2/+2
\| \| \| \|\ \ \
* \| \| \| \ \ \	merge with mysql-5.5.30 minus few incorrect or not applicable changesets	Sergei Golubchik	2013-02-28	1	-56/+82
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	upmerge 14737171 5.1=>5.5	unknown	2012-12-12	1	-1/+3
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Bug #14737171:MTR DOES NOT PRESERVE TEST CASE LOGS ON RETRY-FAIL	unknown	2012-12-12	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	upmerge 14737171 5.1 => 5.5	unknown	2012-12-11	1	-0/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Bug #14737171: MTR DOES NOT PRESERVE TEST CASE LOGS ON RETRY-FAIL	unknown	2012-12-11	1	-0/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	BUG #13946716: FEDERATED_PLUGIN TEST CASE FAIL ON 64BIT ARCHITECTURES	unknown	2012-06-14	1	-0/+2
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	BUG #15895810 - REQUIRE ADDITIONAL INFORMATION WITH THE --RESULT-FILE OPTION ↵	unknown	2012-11-20	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	OF MTR
\| * \| \| \| \|	mtr.pl	unknown	2012-11-04	1	-21/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- remove unused hack to turn on extra suites based on current directory name - remove 4 your old debug printout of "vardir: <dir>"
\| * \| \| \| \|	mtr.pl	unknown	2012-11-04	1	-27/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- improve the logic that decides when ndbcluster should be enabled and the extra test suites for MySQL Cluster should be added. Should be consistent and logical now ;)
\| * \| \| \| \|	Bug#14737559 BZR JOIN PLUGIN TREES INTO INTERNAL/PLUGIN	Tor Didriksen	2012-10-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part three: Fix some search paths.
* \| \| \| \| \|	Fixed problem with failing mysql_upgrade when proc table was not correct.	Michael Widenius	2013-01-11	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved out creation of performance schema tables from mysql_system_tables.sql as the performance_tables creation scripts needs a working mysql.proc to work. client/mysql_upgrade.c: Added option -V, --version debian/dist/Debian/mariadb-server-5.5.files: Added mysql_performance_tables.sql debian/dist/Ubuntu/mariadb-server-5.5.files: Added mysql_performance_tables.sql mysql-test/lib/v1/mysql-test-run.pl: Added mysql_performance_tables.sql mysql-test/mysql-test-run.pl: Added mysql_performance_tables.sql scripts/CMakeLists.txt: Moved out creation of performance schema tables from mysql_system_tables.sql as the performance_tables creation scripts needs a working mysql.proc to work scripts/mysql_install_db.sh: Added mysql_performance_tables.sql scripts/mysql_performance_tables.sql: Moved out creation of performance schema tables from mysql_system_tables.sql as the performance_tables creation scripts needs a working mysql.proc to work scripts/mysql_system_tables.sql: Move creation of performance schema tables to mysql_performance_tables.sql Added 'flush tables' to get things to work if someone deletes a table like mysql.proc before run scripts/mysql_system_tables_fix.sql: ove performance table things to mysql_performance_tables.sql storage/perfschema/pfs.cc: Fixed comment
* \| \| \| \| \|	MDEV-392 MTR: skip-combinations option is declared in help, but is ignored	Sergei Golubchik	2012-08-08	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove unused mtr option
* \| \| \| \| \|	Don't abort InnoDB/XtraDB if one can't allocate resources for AIO	Michael Widenius	2012-06-27	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Better error messages This fixes that one again can run the test systems with many threads without having to increase fs.aio-max-nr. mysql-test/include/mtr_check.sql: Ignore the INNODB_USE_NATIVE_AIO variable (may change during execution) mysql-test/mysql-test-run.pl: Ignore warnings for failure to setup AIO storage/innobase/os/os0file.c: Continue without AIO even if we can't allocate resources for AIO storage/xtradb/os/os0file.c: Continue without AIO even if we can't allocate resources for AIO storage/xtradb/srv/srv0start.c: Give an error message (instead of core dump) if AIO can't be initialized
* \| \| \| \| \|	mysql-5.5 merge	Sergei Golubchik	2012-06-14	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Allow Windows absolute paths in N:\ formatfor the --vardir option	Kent Boortz	2012-04-23	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	apply mysql fix for bug#58421 to XtraDB	Sergei Golubchik	2012-06-08	1	-13/+1
\| \| \| \| \| \|
* \| \| \| \| \|	fixes for bintar mtr failures:	Sergei Golubchik	2012-06-06	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	look for plugins in the correct path. skip --plugin-load if it has the empty soname part, not only if the whole argument is empty.
* \| \| \| \| \|	Added --continue-on-error to mysqltest and mysql-test-run	Sergei Golubchik	2012-05-15	1	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will contune the test case even if there was an error and makes it easier to run a test that contains many sub tests against one engine. (originally by Monty)
* \| \| \| \| \|	Resolve opt_vardir in MTR with realpath. Server resolves some directory ↵	Vladislav Vaintroub	2012-05-04	1	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	names, thus mtr should do it as well, to avoid differences in test output. This fixes sys_vars.secure_file_priv on FreeBSD9.0 buildbot.