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
..
archive_reader.c	Bug#47216 programs should quit if the file specified by --defaults-file option isn't found	2009-10-09 19:44:22 +05:00
archive_test.c	Modified read buffer to see if performance difference existed.	2007-03-20 22:13:55 -07:00
azio.c	fix for pb2 failure after bug#47012 push.	2009-11-17 17:44:27 +05:30
azlib.h	Bug#29125 Windows Server X64: so many compiler warnings	2009-02-13 11:41:47 -05:00
CMakeLists.txt	- Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE	2009-12-01 12:00:50 +01:00
ha_archive.cc	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
ha_archive.h	WL#2360 Performance schema	2009-12-04 18:26:15 -07:00
Makefile.am	Add missing cleanup, needed for "make distcheck" to succeed.	2009-11-13 23:07:41 +01:00
plug.in	auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files	2006-05-06 07:43:18 -04:00