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
..
CMakeLists.txt	- Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE	2009-12-01 12:00:50 +01:00
ha_tina.cc	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
ha_tina.h	WL#2360 Performance schema	2009-12-04 18:26:15 -07:00
Makefile.am	Ensure that all dtrace files are properly removed during make clean	2009-04-05 22:18:21 +02:00
plug.in	Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed.	2006-08-18 21:19:19 -07:00
transparent_file.cc	WL#2360 Performance schema	2009-12-04 18:26:15 -07:00
transparent_file.h	compiler warning fix	2009-03-24 13:02:01 +04:00