Sergei Golubchik 853077ad7e Merge branch '10.0' into bb-10.1-merge ...

Conflicts:
	.bzrignore
	VERSION
	cmake/plugin.cmake
	debian/dist/Debian/control
	debian/dist/Ubuntu/control
	mysql-test/r/join_outer.result
	mysql-test/r/join_outer_jcl6.result
	mysql-test/r/null.result
	mysql-test/r/old-mode.result
	mysql-test/r/union.result
	mysql-test/t/join_outer.test
	mysql-test/t/null.test
	mysql-test/t/old-mode.test
	mysql-test/t/union.test
	packaging/rpm-oel/mysql.spec.in
	scripts/mysql_config.sh
	sql/ha_ndbcluster.cc
	sql/ha_ndbcluster_binlog.cc
	sql/ha_ndbcluster_cond.cc
	sql/item_cmpfunc.h
	sql/lock.cc
	sql/sql_select.cc
	sql/sql_show.cc
	sql/sql_update.cc
	sql/sql_yacc.yy
	storage/innobase/buf/buf0flu.cc
	storage/innobase/fil/fil0fil.cc
	storage/innobase/include/srv0srv.h
	storage/innobase/lock/lock0lock.cc
	storage/tokudb/CMakeLists.txt
	storage/xtradb/buf/buf0flu.cc
	storage/xtradb/fil/fil0fil.cc
	storage/xtradb/include/srv0srv.h
	storage/xtradb/lock/lock0lock.cc
	support-files/mysql.spec.sh

2014-12-02 22:25:16 +01:00

..

binlog_base64_flag.result

Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6

2013-09-23 18:58:33 +04:00

binlog_bug23533.result

BUG#12371924. Fxi test case

2011-04-25 23:49:56 +04:00

binlog_bug36391.result

WL#5867, reorganize test cases of bugs suite

2011-04-14 00:18:08 +04:00

binlog_checkpoint.result

fix tests to cleanup after themselves

2014-02-06 16:27:55 +01:00

binlog_checksum.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_database.result

10.0-base merge

2013-12-16 13:02:21 +01:00

binlog_delete_and_flush_index.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_drop_if_exists.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_format_switch_in_tmp_table.result

…

binlog_grant.result

WL#6236: Allow SHOW MASTER LOGS and SHOW BINARY LOGS with REPLICATION CLIENT

2012-04-18 10:12:19 +01:00

binlog_implicit_commit.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

binlog_incident.result

…

binlog_index.result

Fixes after Serg's review of %M extenstions

2012-06-17 15:34:39 +03:00

binlog_innodb_row.result

10.0-base merge

2013-12-16 13:02:21 +01:00

binlog_innodb.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

binlog_ioerr.result

MDEV-26: Global transaction ID

2013-03-26 10:35:34 +01:00

binlog_killed_simulate.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_killed.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_max_extension.result

BUG#46166

2010-12-07 16:55:25 +00:00

binlog_mdev342.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

binlog_mixed_cache_stat.result

BUG#57275 binlog_cache_size affects trx- and stmt-cache and gets twice the expected memory

2010-11-05 17:42:37 +00:00

binlog_mixed_load_data.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

binlog_mysqlbinlog2.result

MDEV-26: Global transaction ID. First alpha release.

2013-04-15 10:55:27 +02:00

binlog_mysqlbinlog_base64.result

BUG#14659685 - main.mysqlbinlog_row_myisam and

2012-10-30 10:40:07 +05:30

binlog_mysqlbinlog_row_innodb.result

MDEV-5528 Command line variable to choose MariaDB-5.3 vs MySQL-5.6 temporal data formats

2014-11-03 21:45:06 +04:00

binlog_mysqlbinlog_row_myisam.result

MDEV-5528 Command line variable to choose MariaDB-5.3 vs MySQL-5.6 temporal data formats

2014-11-03 21:45:06 +04:00

binlog_mysqlbinlog_row_trans.result

MDEV-26: Global transaction ID. First alpha release.

2013-04-15 10:55:27 +02:00

binlog_mysqlbinlog_row.result

MDEV-5528 Command line variable to choose MariaDB-5.3 vs MySQL-5.6 temporal data formats

2014-11-03 21:45:06 +04:00

binlog_mysqlbinlog-cp932.result

BUG#14659685 - main.mysqlbinlog_row_myisam and

2012-10-30 10:40:07 +05:30

binlog_old_versions.result

MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)

2014-10-11 18:53:06 +02:00

binlog_query_filter_rules.result

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

binlog_reset_master.result

BUG#12574820: binlog.binlog_tmp_table timing out in daily and weekly trunk run

2011-05-26 12:50:43 +02:00

binlog_row_annotate.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

binlog_row_binlog.result

MDEV-6247: Merge 10.0-galera to 10.1.

2014-08-26 15:43:46 +03:00

binlog_row_cache_stat.result

BUG#57275 binlog_cache_size affects trx- and stmt-cache and gets twice the expected memory

2010-11-05 17:42:37 +00:00

binlog_row_ctype_cp932.result

5.5 merge

2014-05-09 12:35:11 +02:00

binlog_row_ctype_ucs.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

binlog_row_drop_tbl.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

binlog_row_drop_tmp_tbl.result

10.0-base merge

2013-12-16 13:02:21 +01:00

binlog_row_insert_select.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

binlog_row_mix_innodb_myisam.result

10.0-base merge

2013-12-16 13:02:21 +01:00

binlog_row_mysqlbinlog_db_filter.result

…

binlog_row_mysqlbinlog_options.result

MDEV-26: Global transaction ID. First alpha release.

2013-04-15 10:55:27 +02:00

binlog_row_mysqlbinlog_verbose.result

BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIER

2012-09-22 17:50:51 +05:30

binlog_server_id.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_sf.result

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

binlog_spurious_ddl_errors.result

Description

2013-01-18 12:32:37 +05:30

binlog_sql_mode.result

Bug#12601974 - STORED PROCEDURE SQL_MODE=NO_BACKSLASH_ESCAPES IGNORED AND BREAKS REPLICATION

2012-02-29 12:23:15 +05:30

binlog_start_comment.result

…

binlog_statement_insert_delayed.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_stm_binlog.result

MDEV-6247: Merge 10.0-galera to 10.1.

2014-08-26 15:43:46 +03:00

binlog_stm_blackhole.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_stm_cache_stat.result

BUG#57275 binlog_cache_size affects trx- and stmt-cache and gets twice the expected memory

2010-11-05 17:42:37 +00:00

binlog_stm_ctype_cp932.result

5.5 merge

2014-05-09 12:35:11 +02:00

binlog_stm_ctype_ucs.result

10.0-base merge

2013-06-06 21:32:29 +02:00

binlog_stm_do_db.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_stm_drop_tbl.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_stm_drop_tmp_tbl.result

10.0-base merge

2013-12-16 13:02:21 +01:00

binlog_stm_insert_select.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_stm_mix_innodb_myisam.result

10.0-monty merge

2013-07-21 16:39:19 +02:00

binlog_stm_ps.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_stm_row.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

binlog_stm_unsafe_warning.result

print binlog unsafe errors at log_warnings level 1, not 2.

2014-09-18 15:24:30 +02:00

binlog_stm_user_variables.result

Merge 10.0-base -> 10.0 (GTID).

2013-04-17 15:17:01 +02:00

binlog_switch_inside_trans.result

BUG#53437 @@session.sql_bin_log support in substatements is incorrect

2010-05-27 16:43:08 +01:00

binlog_tmp_table.result

BUG#53101: binlog.binlog_tmp_table fails on sol10 sparc64 max in

2010-04-27 12:25:55 +01:00

binlog_truncate_innodb.result

Bug#42643: InnoDB does not support replication of TRUNCATE TABLE

2010-05-25 17:01:38 -03:00

binlog_truncate_kill.result

5.5.38 merge

2014-06-06 00:07:27 +02:00

binlog_truncate_myisam.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

binlog_unsafe.result

Don't give warning if there are two unique keys used with INSERT .. ON DUPLICATE KEY UPDATE.

2014-09-16 00:00:47 +03:00

binlog_write_error.result

rename debug variable to debug_dbug, to make test pass in release builds

2011-12-15 22:07:58 +01:00

binlog_xa_recover.result

MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work

2013-12-09 12:37:45 +01:00

load_data_stm_view.result

5.5 merge

2014-11-19 17:23:39 +01:00