database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merged from mysql-4.1 to mysql-5.0

Browse Source
This commit is contained in:
msvensson@neptunus.(none)
2005-06-22 14:10:02 +02:00
parent 2af4f441fe 61a3e16bfd
commit 85b9ffc4ca
20 changed files with 658 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_base.cc
View File

@@ -1611,8 +1611,18 @@ static int open_unireg_entry(THD *thd, TABLE *entry, const char *db,
*/
if (discover_retry_count++ != 0)
goto err;
if (ha_create_table_from_engine(thd, db, name, TRUE) != 0)
if (ha_create_table_from_engine(thd, db, name) > 0)
{
/* Give right error message */
thd->clear_error();
DBUG_PRINT("error", ("Dicovery of %s/%s failed", db, name));
my_printf_error(ER_UNKNOWN_ERROR,
"Failed to open '%-.64s', error while "
"unpacking from engine",
MYF(0), name);
goto err;
}
mysql_reset_errors(thd, 1); // Clear warnings
thd->clear_error(); // Clear error message