diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 16:43:05 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 16:43:05 +0200 |
| commit | 4b63b4adc0dc2326fb586d6ace066af44ff374a4 (patch) | |
| tree | f94ddc1a213afc4561ed6cb318761890998bf895 /sql/table.cc | |
| parent | fa8dafe5bba7b4c72c1e0bbf10d7a9e10b4ebe8a (diff) | |
| parent | 5af7ca80d98459b9c163328eaf8709abdf8c9883 (diff) | |
| download | mariadb-git-4b63b4adc0dc2326fb586d6ace066af44ff374a4.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/sql/table.cc b/sql/table.cc index 1acf49bc03e..3bc5c9a242b 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1694,29 +1694,6 @@ bool check_column_name(const char *name) } /* -** Get type of table from .frm file -*/ - -db_type get_table_type(THD *thd, const char *name) -{ - File file; - uchar head[4]; - int error; - DBUG_ENTER("get_table_type"); - DBUG_PRINT("enter",("name: '%s'",name)); - - if ((file=my_open(name,O_RDONLY, MYF(0))) < 0) - DBUG_RETURN(DB_TYPE_UNKNOWN); - error=my_read(file,(byte*) head,4,MYF(MY_NABP)); - my_close(file,MYF(0)); - if (error || head[0] != (uchar) 254 || head[1] != 1 || - (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(thd,(enum db_type) (uint) *(head+3),0,0)); -} - -/* Create Item_field for each column in the table. SYNPOSIS |