diff options
| author | unknown <tulin@dl145b.mysql.com> | 2005-06-18 09:21:50 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145b.mysql.com> | 2005-06-18 09:21:50 +0200 |
| commit | 5ac7f0b3e4f3b019f212d9d3b82995bd1ac38d76 (patch) | |
| tree | 3dcc8706f4e1e391d796702969759c1e135a4620 /sql/unireg.cc | |
| parent | 06d99235b7f1d7d80012ccf2fc8276780fb3de15 (diff) | |
| parent | 0945dea8d08b13189691052b79fe2bd255e0f008 (diff) | |
| download | mariadb-git-5ac7f0b3e4f3b019f212d9d3b82995bd1ac38d76.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index a93f358c011..2ea79d92e37 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -113,7 +113,7 @@ bool mysql_create_frm(THD *thd, my_string file_name, } reclength=uint2korr(forminfo+266); - if ((file=create_frm(file_name, reclength, fileinfo, + if ((file=create_frm(thd, file_name, reclength, fileinfo, create_info, keys)) < 0) { my_free((gptr) screen_buff,MYF(0)); |