Alexey Kopytov fa3b2dcb83 Manual merge of mysql-5.1-bugteam to ... mysql-trunk-merge. Conflicts: Text conflict in sql/sql_priv.h		2010-04-19 16:09:44 +04:00
..
client_priv.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
CMakeLists.txt	Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed.	2009-12-17 14:41:50 +01: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	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
my_readline.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
mysql.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
mysql_upgrade.c	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
mysqladmin.cc	A follow-up on WL#5154 and WL#5182: remove forgotten options.	2010-03-03 22:22:02 +03:00
mysqlbinlog.cc	Manual merge of mysql-5.1-bugteam to	2010-04-19 16:09:44 +04:00
mysqlcheck.c	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
mysqldump.c	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
mysqlimport.c	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
mysqlshow.c	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
mysqlslap.c	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
mysqltest.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
readline.cc	This is the downport of	2009-09-11 22:26:35 +02:00
sql_string.cc	Backport of WL #2934: Make/find library for doing float/double	2009-12-22 19:23:13 +03:00
sql_string.h	Bug #33544 UDF_INIT member decimals initialized wrong with	2009-11-11 21:19:41 +01:00