Seppo Jaakola bd0eae595f References: MDEV-4572 - merge with mariaDB 5.5.31 ...

bzr merge lp:maria/5.5 -rtag:mariadb-5.5.31

Text conflict in cmake/cpack_rpm.cmake
Text conflict in debian/dist/Debian/control
Text conflict in debian/dist/Ubuntu/control
Text conflict in sql/CMakeLists.txt
Conflict adding file sql/db.opt.  Moved existing file to sql/db.opt.moved.
Conflict adding file sql/db.opt.moved.  Moved existing file to sql/db.opt.moved.moved.
Text conflict in sql/mysqld.cc
Text conflict in support-files/mysql.spec.sh
8 conflicts encountered.

2013-05-26 11:26:58 +03:00

..

CMakeLists.txt

References lp:1115708 - merged with lp:mariadb/5.5 revision 3657

2013-02-05 20:19:47 +02:00

comp_sql.c

fix warning

2011-03-11 16:06:35 +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

MDEV-471 update help tables.

2012-08-28 15:07:50 +05:00

make_binary_distribution.sh

5.3 merge

2012-02-24 14:37:00 +01:00

make_win_bin_dist

5.3 merge

2012-01-13 15:50:02 +01:00

msql2mysql.sh

…

mysql_config.pl.in

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

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

mysql_config.sh

MDEV-3826 compilation of client programs fail: m_string.h tries to include <mysql/plugin.h>

2012-11-15 19:20:10 +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

5.3 merge

2013-01-15 19:07:46 +01:00

mysql_install_db.sh

MDEV-4068 rpm scriptlet chown command dangerous

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

Merge MySQL 5.1.66 -> MariaDB 5.1.65

2012-11-06 11:52:55 +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

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

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

mysql_system_tables_data.sql

mysql-5.5.31 merge

2013-05-07 13:05:09 +02:00

mysql_system_tables_fix.sql

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

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

mysql_system_tables.sql

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

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

mysql_test_data_timezone.sql

- Added/updated copyright headers

2010-12-28 19:57:23 +01:00

mysql_zap.sh

Updated/added copyright headers

2011-06-30 17:37:13 +02:00

mysqlaccess.conf

merge

2010-08-20 09:12:36 -05:00

mysqlaccess.sh

Buildbot fixes and cleanups:

2013-01-11 02:03:43 +02:00

mysqlbug.sh

Fix test suite so that it works when doing configure --without-uca

2009-12-27 15:54:41 +02:00

mysqld_multi.sh

References: MDEV-4572 - merge with mariaDB 5.5.30

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

mysqld_safe.sh

References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..3867

2013-05-25 12:22:57 +03:00

mysqldumpslow.sh

MDEV-4068 rpm scriptlet chown command dangerous

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

mysqlhotcopy.sh

mysql-5.5.28

2012-10-16 13:04:42 +02:00

mytop.sh

RPM fixes:

2012-10-17 19:04:08 +02:00

wsrep_sst_common.sh

References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..3867

2013-05-25 12:22:57 +03:00

wsrep_sst_mysqldump.sh

References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..3867

2013-05-25 12:22:57 +03:00

wsrep_sst_rsync.sh

References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..3867

2013-05-25 12:22:57 +03:00

wsrep_sst_xtrabackup.sh

References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..3867

2013-05-25 12:22:57 +03:00