diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-03 21:39:04 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-03 21:39:04 +0000 |
| commit | ec81fca2d08a4cb9532aef7404c480f34fe145cb (patch) | |
| tree | aba1618cac773466e58a7ff45f66bb205fe52130 /sql/sql_base.cc | |
| parent | 52d5c01d8742960c23bc06be6b046da6e9951694 (diff) | |
| parent | 341d8aaee39951dfd771db2b0da9a689149facf1 (diff) | |
| download | mariadb-git-ec81fca2d08a4cb9532aef7404c480f34fe145cb.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/mysql-test-run.sh:
SCCS merged
sql/ha_ndbcluster.cc:
SCCS merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 65ac38cdd6e..2770d93bf26 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1343,7 +1343,7 @@ static int open_unireg_entry(THD *thd, TABLE *entry, const char *db, */ if (discover_retry_count++ != 0) goto err; - if (create_table_from_handler(db, name, true) != 0) + if (ha_create_table_from_engine(thd, db, name, true) != 0) goto err; thd->clear_error(); // Clear error message |