Sergei Golubchik f72a765997 5.2 merge. ...

two tests still fail:
  main.innodb_icp and main.range_vs_index_merge_innodb
  call records_in_range() with both range ends being open
  (which triggers an assert)

2012-08-22 16:45:25 +02:00

..

.cvsignore

…

client_priv.h

Merge with 5.2.

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

CMakeLists.txt

Merge with 5.2.

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

completion_hash.cc

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

completion_hash.h

- Added/updated copyright headers

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

echo.c

echo.c:

2007-03-20 18:31:49 +01:00

get_password.c

fixes for build failures due to my yesterday's changeset forbidding

2008-02-19 18:45:11 +01:00

Makefile.am

5.2 merge

2012-05-02 22:02:06 +02:00

my_readline.h

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

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

mysql_upgrade.c

Merge with MariaDB 5.1

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

mysql.cc

5.2->5.3 merge

2011-12-12 13:00:33 +01:00

mysqladmin.cc

Merge with MariaDB 5.1

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

mysqlbinlog.cc

5.2 merge.

2012-08-22 16:45:25 +02:00

mysqlcheck.c

Merge with MariaDB 5.1

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

mysqldump.c

5.2 merge.

2012-08-22 16:45:25 +02:00

mysqlimport.c

Merge with MariaDB 5.1

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

mysqlshow.c

Merge with MariaDB 5.1

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

mysqlslap.c

5.2 merge

2012-05-20 14:57:29 +02:00

mysqltest.cc

5.2 merge.

2012-08-22 16:45:25 +02:00

readline.cc

Merge with 5.2.

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

sql_string.cc

merge

2012-04-05 23:07:18 +02:00

sql_string.h

Merge with 5.2.

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