diff options
| author | unknown <acurtis@xiphis.org> | 2005-06-17 22:32:46 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-06-17 22:32:46 +0100 |
| commit | 49353a937ac5f7bf4bacf199c64042cfa4e6c593 (patch) | |
| tree | 5cfe38c5054ad8ece885433dba25fbbf35c4ea01 /sql/table.cc | |
| parent | 6f0ea5bc866f0d4d46e4722053442a1eee2657c9 (diff) | |
| parent | 6c085d9f9d1fce0b8652f91f85b018e5815aac13 (diff) | |
| download | mariadb-git-49353a937ac5f7bf4bacf199c64042cfa4e6c593.tar.gz | |
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into xiphis.org:/usr/home/antony/work2/p3-bug6877.3
sql/mysql_priv.h:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/table.cc b/sql/table.cc index 55beac10812..f7dc0446a77 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -163,7 +163,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, if (share->frm_version == FRM_VER_TRUE_VARCHAR -1 && head[33] == 5) share->frm_version= FRM_VER_TRUE_VARCHAR; - share->db_type= ha_checktype((enum db_type) (uint) *(head+3)); + share->db_type= ha_checktype(thd,(enum db_type) (uint) *(head+3),0,0); share->db_create_options= db_create_options=uint2korr(head+30); share->db_options_in_use= share->db_create_options; share->mysql_version= uint4korr(head+51); @@ -1341,8 +1341,8 @@ void append_unescaped(String *res, const char *pos, uint length) /* Create a .frm file */ -File create_frm(register my_string name, uint reclength, uchar *fileinfo, - HA_CREATE_INFO *create_info, uint keys) +File create_frm(THD *thd, register my_string name, uint reclength, + uchar *fileinfo, HA_CREATE_INFO *create_info, uint keys) { register File file; ulong length; @@ -1375,7 +1375,7 @@ File create_frm(register my_string name, uint reclength, uchar *fileinfo, fileinfo[1]= 1; fileinfo[2]= FRM_VER+3+ test(create_info->varchar); - fileinfo[3]= (uchar) ha_checktype(create_info->db_type); + fileinfo[3]= (uchar) ha_checktype(thd,create_info->db_type,0,0); fileinfo[4]=1; int2store(fileinfo+6,IO_SIZE); /* Next block starts here */ key_length=keys*(7+NAME_LEN+MAX_REF_PARTS*9)+16; @@ -1637,7 +1637,7 @@ bool check_column_name(const char *name) ** Get type of table from .frm file */ -db_type get_table_type(const char *name) +db_type get_table_type(THD *thd, const char *name) { File file; uchar head[4]; @@ -1653,7 +1653,7 @@ db_type get_table_type(const char *name) (head[2] != FRM_VER && head[2] != FRM_VER+1 && (head[2] < FRM_VER+3 || head[2] > FRM_VER+4))) DBUG_RETURN(DB_TYPE_UNKNOWN); - DBUG_RETURN(ha_checktype((enum db_type) (uint) *(head+3))); + DBUG_RETURN(ha_checktype(thd,(enum db_type) (uint) *(head+3),0,0)); } |