Alexander Nozdrin a6667f8577 Manual merge from mysql-trunk-merge. ... Conflicts: - configure.in - include/m_string.h - mysql-test/extra/rpl_tests/rpl_row_func003.test - mysql-test/r/mysqlbinlog.result - mysql-test/r/union.result - mysql-test/suite/binlog/r/binlog_killed_simulate.result - mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/r/rpl_loaddata_fatal.result - mysql-test/suite/rpl/r/rpl_loaddata_map.result - mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result - mysql-test/suite/rpl/r/rpl_stm_log.result - mysql-test/suite/rpl/t/rpl_optimize.test - mysql-test/t/mysqlbinlog.test - mysql-test/t/union.test - sql/rpl_utility.h - sql/sql_union.cc - strings/Makefile.am		2010-01-19 19:36:14 +03:00
..
client_priv.h	WL#2360 Performance schema	2010-01-06 22:42:07 -07: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	Manual merge from next-mr.	2010-01-12 20:07:09 +08:00
my_readline.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
mysql.cc	Manual merge from mysql-trunk-merge.	2010-01-19 19:36:14 +03:00
mysql_upgrade.c	Manual merge from mysql-trunk-merge.	2009-12-16 21:02:21 +03:00
mysqladmin.cc	Manual merge/pull from mysql-next-mr.	2009-11-25 18:03:05 +03:00
mysqlbinlog.cc	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2010-01-07 15:39:11 +00:00
mysqlcheck.c	Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc	2009-12-11 01:58:13 -07:00
mysqldump.c	Auto-merge from mysql-trunk-merge.	2009-12-24 10:56:13 +03:00
mysqlimport.c	Manual merge/pull from mysql-next-mr.	2009-11-25 18:03:05 +03:00
mysqlshow.c	merging.	2009-11-17 15:27:40 +04:00
mysqlslap.c	Manual merge/pull from mysql-next-mr.	2009-11-25 18:03:05 +03:00
mysqltest.cc	Backporting revision from mysql-6.0-codebase-bugfixing.	2010-01-11 19:43:55 +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