Michael Widenius 2534521f9a Fixed some merge issues: ...

- temporary tables now works
- mysql-system_tables updated to not use temporary tables
- PASSWORD() function fixed
- Support for STATS_AUTO_RECALC, STATS_PERSISTENT and STATS_SAMPLE_PAGES table options

2013-06-18 02:01:34 +03:00

..

CMakeLists.txt

More merge fixes:

2013-06-16 21:26:40 +03:00

comp_sql.c

MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails

2012-12-16 21:11:24 +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

10.0-base merge

2013-01-31 09:48:19 +01:00

mysql_install_db.sh

10.0-base merge

2013-01-31 09:48:19 +01:00

mysql_performance_tables.sql

More merge fixes:

2013-06-16 21:26:40 +03: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

Fixed some merge issues:

2013-06-18 02:01:34 +03:00

mysql_system_tables_fix.sql

More merge fixes:

2013-06-16 21:26:40 +03:00

mysql_system_tables.sql

Fixed some merge issues:

2013-06-18 02:01:34 +03: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

5.3 merge

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

mysqld_safe.sh

mysql-5.5.29 merge

2013-01-15 19:13:32 +01:00

mysqldumpslow.sh

Merge with MariaDB 5.1

2011-11-24 18:48:58 +02:00

mysqlhotcopy.sh

mysql-5.5.28

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

mytop.sh

RPM fixes:

2012-10-27 15:05:01 +02:00