database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge with 4.0 tree

Browse Source 
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
This commit is contained in:
unknown
2003-11-18 18:54:27 +02:00
parent cde9c4299b c072804d51
commit 84281294ea
8 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_handler.cc
View File

@ -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;
}