diff options
author | unknown <bar@mysql.com> | 2004-06-24 18:51:32 +0500 |
---|---|---|
committer | unknown <bar@mysql.com> | 2004-06-24 18:51:32 +0500 |
commit | 73d9c9b129475dec400092badb9c1adec892a4da (patch) | |
tree | dc7631207f09aa4428efe8a3458f8627eb4ea379 /sql/table.cc | |
parent | 9293805a03b44d5452ecc4fc0be9cb1b7143571e (diff) | |
parent | 5ce95c0a9cf6090f3c386c92a8f86d838d30a56a (diff) | |
download | mariadb-git-73d9c9b129475dec400092badb9c1adec892a4da.tar.gz |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index 6bf1d8c3323..5024015c382 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -126,6 +126,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, goto err_not_open; /* purecov: inspected */ *fn_ext(index_file)='\0'; // Remove .frm extension + outparam->frm_version= head[2]; outparam->db_type=ha_checktype((enum db_type) (uint) *(head+3)); outparam->db_create_options=db_create_options=uint2korr(head+30); outparam->db_options_in_use=outparam->db_create_options; |