Alexander Nozdrin b3018e8613 Manual merge from mysql-trunk-merge. ... Conflicts: - client/mysql.cc - client/mysqldump.c - configure.in - mysql-test/r/csv.result - mysql-test/r/func_time.result - mysql-test/r/show_check.result - mysql-test/r/sp-error.result - mysql-test/r/sp.result - mysql-test/r/sp_trans.result - mysql-test/r/type_blob.result - mysql-test/r/type_timestamp.result - mysql-test/r/warnings.result - mysql-test/suite/rpl/r/rpl_sp.result - sql/mysql_priv.h - sql/mysqld.cc - sql/sp.cc - sql/sql_base.cc - sql/sql_table.cc - sql/sql_trigger.cc - sql/sql_view.cc - sql/table.h - sql/share/errmsg.txt - mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result		2010-02-24 16:52:27 +03:00
..
yassl	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03: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	Install extremely useful program "replace"	2010-02-19 18:04:35 +01:00
comp_err.c	Bug#10143 Perror not showing error description	2010-02-23 17:45:49 -07: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	Bug#10143 Perror not showing error description	2010-02-23 17:45:49 -07:00
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