diff options
| author | unknown <monty@mysql.com> | 2005-05-25 18:38:29 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-05-25 18:38:29 +0300 |
| commit | e38f06f7ff0f02b4fbd5665b2aa5652c7569c623 (patch) | |
| tree | 0069402a1a22f1a79b67847e8bbe115501385c71 /sql/sql_base.cc | |
| parent | f0f9b5959eecb87b369fc45c981d926b79de0c61 (diff) | |
| parent | c6283dbba9e0ec066e9fd8211e0d1629507f193e (diff) | |
| download | mariadb-git-e38f06f7ff0f02b4fbd5665b2aa5652c7569c623.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 2e9cf1ae40d..9e5ca4453c6 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1607,9 +1607,9 @@ static int open_unireg_entry(THD *thd, TABLE *entry, const char *db, trying to discover the table at the same time. */ if (discover_retry_count++ != 0) - goto err; + goto err; if (ha_create_table_from_engine(thd, db, name, TRUE) != 0) - goto err; + goto err; mysql_reset_errors(thd, 1); // Clear warnings thd->clear_error(); // Clear error message |