Michael Widenius 6d4224a31c Merge with 5.2. ...

no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit

2011-12-11 11:34:44 +02:00

..

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

CMakeLists.txt

Added mytop to distribution (with some small trivial changes to make it workg good also for MariaDB)

2011-06-27 19:30:05 +03:00

comp_sql.c

fix warning

2011-03-11 16:06:35 +01:00

convert-debug-for-diff.sh

Trivial fixes, more safe DBUG_ASSERT()'s and some more DBUG_

2010-08-23 12:52:57 +03:00

fill_help_tables.sql

Merge with MySQL 5.1.55

2011-02-20 18:51:43 +02:00

make_binary_distribution.sh

Remove extra MariaDB- from binary tar.gz file name

2011-10-16 22:46:11 +03:00

make_sharedlib_distribution.sh

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

make_win_bin_dist

Merge with 5.2.

2011-12-11 11:34:44 +02:00

Makefile.am

Merge with 5.2.

2011-12-11 11:34:44 +02:00

msql2mysql.sh

gen_lex_hash.cc:

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

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

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

2011-11-21 19:13:14 +02: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_fix_privilege_tables.sh

Ensure that all clients reads the appropriate 'client', client-mariadb and 'mariadb' sections from my.cnf

2011-03-18 17:03:43 +02:00

mysql_install_db.pl.in

Merge with MariaDB 5.1

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

mysql_install_db.sh

Merge with 5.2.

2011-12-11 11:34:44 +02:00

mysql_secure_installation.pl.in

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

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

mysql_secure_installation.sh

Merge with MariaDB 5.1

2011-11-24 18:48:58 +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

Merge with MariaDB 5.1

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

mysql_system_tables_fix.sql

Merge with 5.2.

2011-12-11 11:34:44 +02:00

mysql_system_tables.sql

Merge with 5.2.

2011-12-11 11:34:44 +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

configure fixes

2000-09-14 15:10:06 +03:00

mysqlaccess.sh

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

2011-11-21 19:13:14 +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

Merge with MariaDB 5.1

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

mysqld_safe.sh

Added --log-basename to mysqld to allow one to set the prefix for all logs with one command

2011-03-23 17:59:41 +02:00

mysqldumpslow.sh

Merge with MariaDB 5.1

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

mysqlhotcopy.sh

Merge with 5.2.

2011-12-11 11:34:44 +02:00

mytop.sh

Added handler and temporary table usage to mytop

2011-12-03 23:06:16 +02:00