Michael Widenius 6d4224a31c Merge with 5.2. ... no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit		2011-12-11 11:34:44 +02:00
..
charsets	Initail merge with MySQL 5.1 (XtraDB still needs to be merged)	2011-11-21 19:13:14 +02:00
.cvsignore
CMakeLists.txt	MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order	2011-01-29 18:51:12 +01:00
errmsg.txt	Merge with 5.2.	2011-12-11 11:34:44 +02:00
Makefile.am	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00