Monty fbab79c9b8 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext ...

Conflicts:
	cmake/make_dist.cmake.in
	mysql-test/r/func_json.result
	mysql-test/r/ps.result
	mysql-test/t/func_json.test
	mysql-test/t/ps.test
	sql/item_cmpfunc.h

2018-01-01 19:39:59 +02:00

..

CMakeLists.txt

Merge tag 'mariadb-10.0.33' into bb-10.0-galera

2017-11-03 12:34:05 +05:30

comp_sql.c

MDEV-13384 - misc Windows warnings fixed

2017-09-28 17:20:46 +00:00

convert-debug-for-diff.sh

…

dheadgen.pl

BUG#25719975 SHEBANG HARD CODED AS /USR/BIN/PERL IN SCRIPTS, BREAKS ON FREEBSD

2017-03-28 13:22:32 +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-10767 /tmp/wsrep_recovery.${RANDOM} file created in unallowed SELinux context

2017-09-21 12:37:40 +05:30

make_win_bin_dist

…

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

…

mysql_config.pl.in

Merge remote-tracking branch 'mysql/5.5' into 5.5

2017-07-18 14:59:10 +02:00

mysql_config.sh

MDEV-13836 mariadb_config & mysql_config output differ

2017-10-18 22:15:26 +02:00

mysql_convert_table_format.sh

Merge branch '10.0' into 10.1

2017-08-08 10:18:43 +02:00

mysql_find_rows.sh

Merge branch '10.0' into 10.1

2017-08-08 10:18:43 +02:00

mysql_fix_extensions.sh

Merge branch '10.0' into 10.1

2017-08-08 10:18:43 +02:00

mysql_install_db.pl.in

Merge branch '10.0' into 10.1

2017-08-08 10:18:43 +02:00

mysql_install_db.sh

Merge branch '10.1' into 10.2

2017-10-24 14:53:18 +02:00

mysql_performance_tables.sql

…

mysql_secure_installation.pl.in

Merge remote-tracking branch 'mysql/5.5' into 5.5

2017-07-18 14:59:10 +02: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 10.1

2017-08-08 10:18:43 +02: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-14013 : sql_mode=EMPTY_STRING_IS_NULL

2017-10-14 17:28:54 +04:00

mysql_system_tables.sql

MDEV-14013 : sql_mode=EMPTY_STRING_IS_NULL

2017-10-14 17:28:54 +04:00

mysql_test_data_timezone.sql

…

mysql_to_mariadb.sql

Fixed assert if user table was mailformed.

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

mysqlaccess.conf

BUG#25719975 SHEBANG HARD CODED AS /USR/BIN/PERL IN SCRIPTS, BREAKS ON FREEBSD

2017-03-28 13:22:32 +02:00

mysqlaccess.sh

Merge branch '10.1' into 10.2

2017-08-17 11:38:34 +02:00

mysqld_multi.sh

Merge tag 'mariadb-10.0.32' into 10.0-galera

2017-08-09 08:56:11 +03:00

mysqld_safe.sh

Merge remote-tracking branch 'origin/10.1' into 10.2

2017-12-22 12:23:39 +02:00

mysqldumpslow.sh

Merge branch '10.0' into 10.1

2017-08-08 10:18:43 +02:00

mysqlhotcopy.sh

Merge remote-tracking branch 'mysql/5.5' into 5.5

2017-07-18 14:59:10 +02:00

mytop.sh

Merge 10.0.14 into 10.1

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

wsrep_sst_common.sh

MDEV-13969 sst mysqldump and xtrabackup-v2 handle WSREP_SST_OPT_CONF incorrectly

2017-12-18 16:41:40 +01: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-13969 sst mysqldump and xtrabackup-v2 handle WSREP_SST_OPT_CONF incorrectly

2017-12-18 16:41:40 +01:00

wsrep_sst_rsync.sh

Fixes Galera on FreeBSD

2017-09-13 10:48:10 -07:00

wsrep_sst_xtrabackup-v2.sh

MDEV-13478 Full SST sync fails because of the error in the cleaning part

2017-12-20 18:51:30 +01:00

wsrep_sst_xtrabackup.sh

Merge branch '10.0-galera' into 10.1

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