diff options
author | unknown <monty@mashka.mysql.fi> | 2003-11-18 18:54:27 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-11-18 18:54:27 +0200 |
commit | 84281294eab2441a118d2c1414c6d6e531e89c5b (patch) | |
tree | 21a08cbc0f6aecfbbbf13d5cac0d19bc67952322 /sql/sql_handler.cc | |
parent | cde9c4299b1f77abed719dbacb278030010760e6 (diff) | |
parent | c072804d51c2941a955747afc0dae802e8843845 (diff) | |
download | mariadb-git-84281294eab2441a118d2c1414c6d6e531e89c5b.tar.gz |
Merge with 4.0 tree
BitKeeper/etc/logging_ok:
auto-union
scripts/Makefile.am:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
Auto merged
BUILD/compile-pentium-gcov:
merge
myisam/mi_test2.c:
use original code
mysql-test/t/range.test:
Fixed comment
mysys/mf_keycache.c:
Fixed comments
Diffstat (limited to 'sql/sql_handler.cc')
-rw-r--r-- | sql/sql_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index bce1022d5c0..78e8c877c45 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -242,8 +242,8 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, { if (err != HA_ERR_KEY_NOT_FOUND && err != HA_ERR_END_OF_FILE) { - sql_print_error("mysql_ha_read: Got error %d when reading table", - err); + sql_print_error("mysql_ha_read: Got error %d when reading table '%s'", + err, tables->real_name); table->file->print_error(err,MYF(0)); goto err; } |