Nirbhay Choubey ec91eea8db Local merge of mariadb-5.5.39 ...

bzr merge -r4264 maria/5.5

Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.

2014-08-06 14:06:11 -04:00

..

CMakeLists.txt

Local merge of mariadb-5.5.39

2014-08-06 14:06:11 -04:00

comp_sql.c

mysql-5.5.37 selective merge

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

convert-debug-for-diff.sh

…

dheadgen.pl

…

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

mysql-5.5.39 merge

2014-08-02 21:26:16 +02:00

mysql_convert_table_format.sh

…

mysql_find_rows.sh

…

mysql_fix_extensions.sh

…

mysql_install_db.pl.in

MDEV-5485 Minor man pages formatting issues

2014-05-30 23:19:26 +02:00

mysql_install_db.sh

MDEV-5485 Minor man pages formatting issues

2014-05-30 23:19:26 +02: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

…

mysql_setpermission.sh

…

mysql_system_tables_data.sql

MySQL-5.5.35 merge

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

mysql_system_tables_fix.sql

MDEV-6068 Upgrade removes all changes to 'mysql' database

2014-04-11 00:19:17 +04: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

…

mysqlaccess.conf

Bug#18903155: BACKPORT BUG-18008907 TO 5.5+ VERSIONS.

2014-06-27 17:17:04 +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

Local merge of mariadb-5.5.39

2014-08-06 14:06:11 -04:00

mysqldumpslow.sh

MDEV-4068 rpm scriptlet chown command dangerous

2013-03-06 09:32:13 +01:00

mysqlhotcopy.sh

…

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

bzr merge -r3985..3997 codership/5.5

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

wsrep_sst_xtrabackup-v2.sh

bzr merge -r3985..3997 codership/5.5

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

wsrep_sst_xtrabackup.sh

bzr merge -r3985..3997 codership/5.5

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