diff options
author | unknown <gshchepa/uchum@host.loc> | 2008-03-27 15:54:45 +0400 |
---|---|---|
committer | unknown <gshchepa/uchum@host.loc> | 2008-03-27 15:54:45 +0400 |
commit | a451de2f5949cfb1109be2c8608c5aed65a074de (patch) | |
tree | 26a1228ee041cd494460792a2e5f3bff5c0f0b7b /sql/sql_table.cc | |
parent | 321f392f629479eedf63062f85283e911ce05d7e (diff) | |
parent | b90296c70ac526be823d76ffdb2ef2e8cac87179 (diff) | |
download | mariadb-git-a451de2f5949cfb1109be2c8608c5aed65a074de.tar.gz |
Merge host.loc:/home/uchum/work/mysql-5.1
into host.loc:/home/uchum/work/5.1-opt
client/mysqltest.c:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index b42045446d3..f69f5fadff3 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -42,7 +42,7 @@ static int copy_data_between_tables(TABLE *from,TABLE *to, static bool prepare_blob_field(THD *thd, Create_field *sql_field); static bool check_engine(THD *, const char *, HA_CREATE_INFO *); -static bool +static int mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, Alter_info *alter_info, bool tmp_table, @@ -2177,7 +2177,7 @@ int prepare_create_field(Create_field *sql_field, TRUE error */ -static bool +static int mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, Alter_info *alter_info, bool tmp_table, |