Nirbhay Choubey ab4947463e Merging changes from maria-5.5-galera and ...

some test fixes.

bzr merge -r3479..3493 maria-5.5-galera

2014-05-22 18:31:04 -04:00

..

CMakeLists.txt

bzr merge -r4209 maria/10.0.

2014-05-21 11:09:55 -04:00

comp_sql.c

5.5 merge

2014-05-09 12:35: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/added copyright header. Added line "use is subject to license terms"

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

make_binary_distribution.sh

Added information about the MariaDB foundation

2013-09-23 20:27:37 +03: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.in

mysql-5.5.37 selective merge

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

mysql_config.sh

mysql-5.5.37 selective merge

2014-03-27 22:26:58 +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.5 merge

2014-05-09 12:35:11 +02:00

mysql_install_db.sh

5.5 merge

2014-02-25 16:04:35 +01:00

mysql_performance_tables.sql

MDEV-4058

2013-06-27 12:51:34 +03: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

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

10.0-base merge

2014-02-03 15:22:39 +01:00

mysql_system_tables_fix.sql

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

2014-04-11 02:10:03 +04:00

mysql_system_tables.sql

10.0-base merge

2014-02-26 15:28:07 +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

merge

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

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

Initial merge result with mariaDB 10: lp:maria

2013-07-13 13:01:13 +03:00

mysqld_safe.sh

bzr merge -r4209 maria/10.0.

2014-05-21 11:09:55 -04: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

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..3991 codership/5.5

2014-05-21 15:04:13 -04:00

wsrep_sst_mysqldump.sh

bzr merge -r4065..4088 codership/5.6

2014-05-21 17:07:17 -04:00

wsrep_sst_rsync.sh

Merging changes from maria-5.5-galera and

2014-05-22 18:31:04 -04:00

wsrep_sst_xtrabackup-v2.sh

bzr merge -r4065..4088 codership/5.6

2014-05-21 17:07:17 -04:00

wsrep_sst_xtrabackup.sh

bzr merge -r3985..3991 codership/5.5

2014-05-21 15:04:13 -04:00