Alexey Kopytov acc2b9e366 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. ... Conflicts: Text conflict in mysql-test/r/partition_innodb.result Text conflict in sql/field.h Text conflict in sql/item.h Text conflict in sql/item_cmpfunc.h Text conflict in sql/item_sum.h Text conflict in sql/log_event_old.cc Text conflict in sql/protocol.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_yacc.yy		2010-03-20 23:23:42 +03:00
..
CMakeLists.txt	Backport http://lists.mysql.com/commits/57778	2009-09-30 15:35:01 +02:00
ha_example.cc	Auto-merge from mysql-next-mr.	2009-11-05 15:08:37 +03:00
ha_example.h	Bug #49829 Many "hides virtual function" warnings with	2010-03-14 17:01:45 +01:00
Makefile.am	WL#4903 Plugin Service API part I	2009-11-02 21:05:42 +01:00
plug.in	On internals@mysql a developer at IBM pointed out that DBTYPE needed to be removed from the example (its a single line which was needed for previous versions of MySQL). Its been removed. Added a couple of comments.	2007-08-01 08:50:38 -07:00