Merge from 5.0

This commit is contained in:
Staale Smedseng 2009-06-29 16:00:47 +02:00
commit 300a8721fa
36 changed files with 246 additions and 216 deletions

View file

@ -21,7 +21,7 @@
extern "C" {
void sql_alloc_error_handler(void)
{
sql_print_error(ER(ER_OUT_OF_RESOURCES));
sql_print_error("%s", ER(ER_OUT_OF_RESOURCES));
THD *thd= current_thd;
if (thd)