Alexander Nozdrin 04b8cb1882 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
CMakeLists.txt
comp_err.c	Bug#10143 Perror not showing error description	2010-02-23 17:45:49 -07:00
innochecksum.c
Makefile.am
my_print_defaults.c
mysql_waitpid.c
perror.c	Bug#10143 Perror not showing error description	2010-02-23 17:45:49 -07:00
replace.c
resolve_stack_dump.c
resolveip.c