Nirbhay Choubey 3c9137deeb Merge branch '5.5' into 5.5-galera ...

Merge banch 5.5 till revision :
fdd6c11 - MDEV-7419 Function cli_safe_read not exported

Conflicts:
	.bzrignore
	debian/dist/Debian/mariadb-galera-server-5.5.files.in
	debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
	storage/tokudb/CMakeLists.txt
	support-files/build-tags

2015-02-18 17:15:57 -05:00

..

CMakeLists.txt

Merge revisions from maria/5.5 (5.5.41)

2014-12-22 20:09:25 -05:00

comp_sql.c

mysql-5.5.37 selective merge

2014-03-27 22:26:58 +01: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/added copyright header. Added line "use is subject to license terms"

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

make_binary_distribution.sh

Updated/added copyright headers.

2013-02-25 15:26:00 +01:00

make_win_bin_dist

remove PBXT

2013-08-30 11:25:49 +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

MDEV-6225: Idle replication slave keeps crashing.

2014-06-30 14:02:54 +03:00

mysql_config.pl.in

mysql-5.5.37 selective merge

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

mysql_config.sh

MDEV-7028 mysql_config produces invalid cflags (was: udf_example.c couldn't compile)

2014-11-18 15:43:01 +01:00

mysql_convert_table_format.sh

Initail merge with MySQL 5.1 (XtraDB still needs to be merged)

2011-11-21 19:13:14 +02:00

mysql_find_rows.sh

Updated/added copyright headers

2011-06-30 17:31:31 +02:00

mysql_fix_extensions.sh

Initail merge with MySQL 5.1 (XtraDB still needs to be merged)

2011-11-21 19:13:14 +02:00

mysql_install_db.pl.in

Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42

2015-02-11 23:50:40 +01:00

mysql_install_db.sh

Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42

2015-02-11 23:50:40 +01:00

mysql_performance_tables.sql

Fixed problem with failing mysql_upgrade when proc table was not correct.

2013-01-11 00:53:07 +02:00

mysql_secure_installation.pl.in

Fix for MDEV-5547: Bad error message when moving very old .frm files to MariaDB 5.5.

2014-01-22 15:16:57 +02:00

mysql_secure_installation.sh

Merge MariaDB 5.1.66 -> 5.2.12

2012-11-08 15:24:35 +02:00

mysql_setpermission.sh

Bug #14486004 MYSQL_SETPERMISSION DOES NOT QUOTE USER NAMES

2014-10-17 11:14:26 +05:30

mysql_system_tables_data.sql

MySQL-5.5.35 merge

2014-01-22 15:29:36 +01:00

mysql_system_tables_fix.sql

mysql-5.5.40

2014-10-06 19:53:55 +02:00

mysql_system_tables.sql

MySQL-5.5.36 merge

2014-02-17 11:00:51 +01: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_zap.sh

Updated/added copyright headers

2011-06-30 17:37:13 +02: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

MySQL-5.5.36 merge

2014-02-17 11:00:51 +01:00

mysqlbug.sh

mysql-5.5.37 selective merge

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

mysqld_multi.sh

References: MDEV-4572 - merge with mariaDB 5.5.30

2013-05-24 15:29:01 +03:00

mysqld_safe.sh

Merge branch '5.5' into 5.5-galera

2015-02-18 17:15:57 -05:00

mysqldumpslow.sh

MDEV-4068 rpm scriptlet chown command dangerous

2013-03-06 09:32:13 +01: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

Fix for MDEV-5547: Bad error message when moving very old .frm files to MariaDB 5.5.

2014-01-22 15:16:57 +02:00

wsrep_sst_common.sh

bzr merge -r3985..3997 codership/5.5

2014-06-10 17:00:32 -04:00

wsrep_sst_mysqldump.sh

bzr merge -r3980..3984 codership/5.5

2014-06-10 16:33:57 -04:00

wsrep_sst_rsync.sh

Updated config files:

2014-09-23 14:03:13 -04:00

wsrep_sst_xtrabackup-v2.sh

MDEV-6771 : Incorrect Size for Transfer Reported to pv

2015-01-13 13:10:07 -05:00

wsrep_sst_xtrabackup.sh

MDEV-6771 : Incorrect Size for Transfer Reported to pv

2015-01-13 13:10:07 -05:00