mariadb/client
Alexey Kopytov f0d2fe34f2 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
2010-02-23 16:26:45 +03:00
..
client_priv.h Manual merge from mysql-5.1-bugteam. 2010-01-30 22:13:36 +03: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
echo.c
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.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
mysql_upgrade.c Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
mysqladmin.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
mysqlbinlog.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
mysqlcheck.c Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
mysqldump.c Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
mysqlimport.c Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
mysqlshow.c Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
mysqlslap.c Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
mysqltest.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-23 16:26:45 +03: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