Alexander Nozdrin eacc937d48 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
..
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-merge.	2009-12-12 23:38:59 +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	merging.	2009-11-17 15:27:40 +04: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	Backport of:	2009-11-24 16:54:59 +03: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