Alexey Kopytov 82ba3e1dbc Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. ... Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/sql_acl.cc Text conflict in sql/sql_servers.cc Text conflict in sql/sql_update.cc Text conflict in support-files/mysql.spec.sh		2010-01-15 14:26:53 +03:00
..
yassl	Auto-merge.	2010-01-13 15:04:59 +04:00
charset2html.c	fixes for warnings and compile errors for the fix of bug 26243	2008-03-29 16:12:23 +02:00
CMakeLists.txt	WL#751 Error message construction, backport	2009-10-15 17:23:43 +05:00
comp_err.c	Manual merge from mysql-trunk.	2009-12-11 12:39:38 +03:00
innochecksum.c	Fix incorrect filename in verbose output of innochecksum. (Bug #44484,	2009-05-05 11:07:26 -07:00
Makefile.am	WL#751 Error message construction, backport	2009-10-15 17:23:43 +05:00
my_print_defaults.c	Backport BUG#25192 Using relay-log and relay-log-index without values produces unexpected results.	2009-10-02 16:25:53 +08:00
mysql_waitpid.c	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
perror.c	Fix for BUG#18828 - If InnoDB runs out of undo slots,	2009-07-17 14:13:53 +05:30
replace.c	Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>	2008-02-18 23:29:39 +01:00
resolve_stack_dump.c	Bug#41612: resolve_stack_dump does not decode 5.1 stack trace	2008-12-19 08:47:28 -02:00
resolveip.c	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build	2008-02-13 14:44:56 +01:00