Nirbhay Choubey 02ba2bfdb4 Merging revision from codership-mysql/5.5 (r3928..3968) and ...

codership-mysql/5.6 (r4021..4065).
- Also contains fixes for some build failures.

2014-03-27 16:26:00 -04:00

..

CMakeLists.txt

Merging revision from codership-mysql/5.5 (r3928..3968) and

2014-03-27 16:26:00 -04:00

comp_sql.c

MySQL-5.5.36 merge

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

Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER

2013-03-19 15:53:48 +01:00

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

gen_lex_hash.cc:

2007-01-31 00:06:42 +01:00

mysql_config.pl.in

MDEV-5436 mysql_config returns non-zero when running without parameters

2014-02-17 11:09:45 +01:00

mysql_config.sh

MDEV-5436 mysql_config returns non-zero when running without parameters

2014-02-17 11:09:45 +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

10.0-base merge

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

10.0-base merge

2014-02-26 15:28:07 +01:00

mysql_system_tables.sql

10.0-base merge

2014-02-26 15:28:07 +01:00

mysql_test_data_timezone.sql

Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER

2013-03-19 15:53:48 +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

MySQL-5.5.36 merge

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

mysqlbug.sh

Updated/added copyright headers.

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

mysqld_multi.sh

Initial merge result with mariaDB 10: lp:maria

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

mysqld_safe.sh

* mysqld_safe could not start server as it failed

2014-02-14 17:03:44 -05: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

Merge 10.0 to galera-10.0

2013-09-03 17:50:36 +03:00

wsrep_sst_common.sh

bzr merge -r3946..3968 codership/5.5

2014-03-25 17:01:05 -04:00

wsrep_sst_common.sh.moved

Merged revisions 3411..3417 from mariadb-galera-5.5

2013-10-07 00:18:26 +03:00

wsrep_sst_mysqldump

Merge 10.0 to galera-10.0

2013-09-03 17:50:36 +03:00

wsrep_sst_mysqldump.sh

Merge 10.0 to galera-10.0

2013-09-03 17:50:36 +03:00

wsrep_sst_rsync

Merge fixes, now at level 3430 in mariadb-galera-5.5

2013-10-07 11:35:19 +03:00

wsrep_sst_rsync.sh

bzr merge -r3946..3968 codership/5.5

2014-03-25 17:01:05 -04:00

wsrep_sst_rsync.sh.moved

Merged revisions 3409..3411 from mariadb-galera-5.5

2013-10-06 23:59:20 +03:00

wsrep_sst_xtrabackup

Merge 10.0 to galera-10.0

2013-09-03 17:50:36 +03:00

wsrep_sst_xtrabackup-v2.sh

* bzr merge -r4027..4061 codership/5.6

2014-03-26 11:12:38 -04:00

wsrep_sst_xtrabackup.sh

* bzr merge -r4027..4061 codership/5.6

2014-03-26 11:12:38 -04:00

wsrep_sst_xtrabackup.sh.moved

Merged revisions 3409..3411 from mariadb-galera-5.5

2013-10-06 23:59:20 +03:00