diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-10-30 11:28:19 +0100 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-10-30 11:28:19 +0100 |
| commit | c84d4b213905f37fd0095456dcdd0bfcae51a4f1 (patch) | |
| tree | 4110aa2d735ea23d41f6683de6895b0ba90e17a7 /sql/handler.cc | |
| parent | 7d9c59b7be412210413fc93602ec4522eb1f368b (diff) | |
| parent | 4ce44da3d5351b29e8dd0ed65bf49faeac21254b (diff) | |
| download | mariadb-git-c84d4b213905f37fd0095456dcdd0bfcae51a4f1.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/rpl/r/rpl_bug31076.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
mysql-test/suite/rpl/t/rpl_bug31076.test:
manual merge
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 3939873ec7d..71c3c50a5ff 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2641,8 +2641,7 @@ int ha_create_table_from_engine(THD* thd, const char *db, const char *name) frmblob and frmlen are set, write the frm to disk */ - (void)strxnmov(path,FN_REFLEN-1,mysql_data_home,FN_ROOTDIR, - db,FN_ROOTDIR,name,NullS); + build_table_filename(path, FN_REFLEN-1, db, name, "", 0); // Save the frm file error= writefrm(path, frmblob, frmlen); my_free(frmblob, MYF(0)); |