Alexey Botchkov 1a9e13d622 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext ...

Conflicts:
	sql/item_cmpfunc.cc
	storage/innobase/buf/buf0flu.cc
	storage/innobase/include/ut0stage.h
	storage/innobase/row/row0upd.cc

2017-08-11 10:58:23 +04:00

..

CMakeLists.txt

Merge 10.1 into 10.2

2017-05-06 14:36:46 +03:00

comp_sql.c

5.5.40+ merge

2014-10-09 10:30:11 +02:00

convert-debug-for-diff.sh

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

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

dheadgen.pl

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

fill_help_tables.sql

Updated fill_help_tables for MariaDB

2015-07-10 14:03:39 +03:00

galera_new_cluster.sh

MDEV-13032: fix galera_new_cluster to be POSIX

2017-06-08 12:43:39 +10:00

galera_recovery.sh

MDEV-10396: MariaDB does not restart after upgrade on debian 8

2016-07-27 17:38:38 -04:00

make_win_bin_dist

remove PBXT

2013-08-30 11:25:49 +02:00

maria_add_gis_sp.sql.in

MDEV-10119 mysql_install_db creates GIS procedures with invalid definer.

2016-06-27 22:12:21 +04:00

mariadb-service-convert

Minor typo

2017-01-26 13:51:03 +02:00

msql2mysql.sh

Updated/added copyright header. Added line "use is subject to license terms"

2014-02-17 18:19:04 +05:30

mysql_config.pl.in

mysql-5.5.37 selective merge

2014-03-27 22:26:58 +01:00

mysql_config.sh

5.5 merge

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

mysql_convert_table_format.sh

Change MySQL -> MariaDB inc scripts

2014-08-09 13:22:01 +03:00

mysql_find_rows.sh

Change MySQL -> MariaDB inc scripts

2014-08-09 13:22:01 +03:00

mysql_fix_extensions.sh

Change MySQL -> MariaDB inc scripts

2014-08-09 13:22:01 +03:00

mysql_install_db.pl.in

MDEV-10832 - Out of tree build: mysql_install_db to see all .sql files (#237)

2016-09-23 11:28:38 +04:00

mysql_install_db.sh

Merge branch '10.1' into 10.2

2017-02-10 17:01:45 +01:00

mysql_performance_tables.sql

MDEV-4262 - P_S discovery

2014-08-19 15:18:18 +04:00

mysql_secure_installation.pl.in

MDEV-10248 Cannot Remove Test Tables

2016-07-15 23:51:30 +03:00

mysql_secure_installation.sh

Merge branch '5.5' into 10.0

2017-04-21 18:34:06 +02:00

mysql_setpermission.sh

Merge branch '10.0' into merge-wip

2015-01-31 21:48:47 +01:00

mysql_system_tables_data.sql

mysql_install_db enhancements to facilitate Debian bug#848616 fix

2017-01-17 17:13:14 +01:00

mysql_system_tables_fix.sql

MDEV-11170: MariaDB 10.2 cannot start on MySQL 5.7 datadir:

2017-02-14 07:46:58 +02:00

mysql_system_tables.sql

Merge branch '10.1' into 10.2

2016-06-30 16:38:05 +02:00

mysql_test_data_timezone.sql

Updated/added copyright header. Added line "use is subject to license terms"

2014-02-17 18:19:04 +05:30

mysql_to_mariadb.sql

Fixed assert if user table was mailformed.

2016-05-01 18:52:13 +03:00

mysqlaccess.conf

Bug #19361402 - ADD --MANUAL-LLDB OPTION TO MYSQL-TEST-RUN.PL, contributed

2014-09-02 15:12:55 +05:30

mysqlaccess.sh

General spell fixing in comments and strings

2016-06-08 14:17:23 +03:00

mysqld_multi.sh

Merge branch '10.0' into 10.1

2016-06-28 22:01:55 +02:00

mysqld_safe.sh

Merge branch '10.0' 10.1

2017-04-28 20:19:32 +02:00

mysqldumpslow.sh

MDEV-4412 : SLOW QUERY LOG - add affected rows (UPDATE / DELETE) in slow query log

2014-11-30 21:13:41 -05:00

mysqlhotcopy.sh

for mysql-test: fix mysqlhotcopy script to return a predictable exit code

2014-09-16 13:35:28 +02:00

mytop.sh

Merge 10.0.14 into 10.1

2014-10-15 12:59:13 +02:00

wsrep_sst_common.sh

Merge tag 'mariadb-10.2.6' into bb-10.2-ext

2017-05-26 19:32:28 +04:00

wsrep_sst_mariabackup.sh

MDEV-12548 Initial implementation of Mariabackup for MariaDB 10.2

2017-07-05 11:43:28 +03:00

wsrep_sst_mysqldump.sh

MDEV-13037: wsrep_sst_mysqldump checking wrong version of mysql client

2017-08-09 12:47:12 +03:00

wsrep_sst_rsync.sh

MDEV-10432: Post-fix after merging PR#205

2016-11-21 15:38:33 -05:00

wsrep_sst_xtrabackup-v2.sh

Merge branch '10.0-galera' into 10.1

2016-09-28 13:20:02 -04:00

wsrep_sst_xtrabackup.sh

Merge branch '10.0-galera' into 10.1

2016-09-28 13:20:02 -04:00