diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-08-16 15:51:40 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-08-16 15:51:40 +0300 |
| commit | 2dfd946fd4eaba1632eb9a98bb047a4fe3afbedd (patch) | |
| tree | 9e2129be0d36d6d157a26e783f07de8eb7b52bd2 /storage/myisam | |
| parent | fb135f7ee570a199d78db7c3222db1980b75060f (diff) | |
| parent | cea27d300236436cfc0a0fca6c0993c3867be8f6 (diff) | |
| download | mariadb-git-2dfd946fd4eaba1632eb9a98bb047a4fe3afbedd.tar.gz | |
Automatic merge with 5.2
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 702cb084111..ac4386d4012 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -123,6 +123,9 @@ static void mi_check_print_msg(HA_CHECK *param, const char* msg_type, if (protocol->write()) sql_print_error("Failed on my_net_write, writing to stderr instead: %s\n", msgbuf); + else if (thd->variables.log_warnings > 2) + sql_print_error("%s", msgbuf); + #ifdef THREAD if (param->need_print_msg_lock) pthread_mutex_unlock(¶m->print_msg_mutex); |