Bjorn Munch afdaf6d9df merge 48863,49269,49345,49672,49761

2010-01-06 09:57:44 +01:00

..

client_priv.h

WL#751 Error message construction, backport

2009-10-15 17:23:43 +05:00

CMakeLists.txt

Backport http://lists.mysql.com/commits/57778

2009-09-30 15:35:01 +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

my_strtoll10-x86.s:

2006-12-31 01:02:27 +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

Fix for BUG#46591 - .frm file isn't sync'd with sync_frm enabled for

2009-09-03 16:02:03 +05:30

my_readline.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

mysql_upgrade.c

Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

2009-12-11 19:40:58 +03:00

mysql.cc

Manual merge from mysql-trunk.

2009-12-11 12:39:38 +03:00

mysqladmin.cc

WL#1349 Use operating system localization to send it as a default client character set

2009-10-21 17:59:47 +05:00

mysqlbinlog.cc

Manual merge from mysql-trunk-merge.

2009-11-06 17:20:27 +03:00

mysqlcheck.c

Automerge from mysql-next-mr.

2009-10-23 00:20:44 +04:00

mysqldump.c

Backport of:

2009-10-14 20:37:38 +04:00

mysqlimport.c

WL#1349 Use operating system localization to send it as a default client character set

2009-10-21 17:59:47 +05:00

mysqlshow.c

WL#1349 Use operating system localization to send it as a default client character set

2009-10-21 17:59:47 +05:00

mysqlslap.c

Manual merge from mysql-trunk-merge.

2009-10-14 12:25:39 +04:00

mysqltest.cc

merge 48863,49269,49345,49672,49761

2010-01-06 09:57:44 +01:00

readline.cc

This is the downport of

2009-09-11 22:26:35 +02:00

sql_string.cc

auto-merge

2009-03-19 09:44:58 -04:00

sql_string.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00