Alexander Nozdrin 0ceeeafe85 Manual merge from mysql-next-mr. ... Conflicts: - mysql-test/r/mysqld--help-notwin.result - mysql-test/r/mysqld--help-win.result		2010-02-22 16:22:31 +03:00
..
client_priv.h	WL#5182 Remove more deprecated 4.1/5.0 features	2010-02-17 13:15:07 +01: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	Merge next-mr -> next-4284.	2010-02-05 01:08:08 +03:00
my_readline.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
mysql.cc	WL#5182 Remove more deprecated 4.1/5.0 features	2010-02-17 13:15:07 +01:00
mysql_upgrade.c	Manual merge from mysql-trunk-merge.	2009-12-16 21:02:21 +03:00
mysqladmin.cc	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-01-24 00:09:23 +03:00
mysqlbinlog.cc	WL#5154 Remove deprecated 4.1 features	2010-02-17 10:18:17 +01:00
mysqlcheck.c	Merge next-mr -> next-4284.	2009-12-15 22:59:07 +03:00
mysqldump.c	WL#5182 Remove more deprecated 4.1/5.0 features	2010-02-17 13:15:07 +01:00
mysqlimport.c	Merge next-mr -> next-4284.	2009-12-15 22:59:07 +03:00
mysqlshow.c	merging.	2009-11-17 15:27:40 +04:00
mysqlslap.c	Merge next-mr -> next-4284.	2009-12-15 22:59:07 +03:00
mysqltest.cc	merge	2010-02-20 11:23:12 +01: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