diff options
| author | unknown <monty@mishka.mysql.fi> | 2005-09-14 01:47:38 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.mysql.fi> | 2005-09-14 01:47:38 +0300 |
| commit | d89f5a4e7a44dd4ea940f0a867d8fd706f774fb2 (patch) | |
| tree | 863a08bdf76445e7d8fe93a23233b7ccf14a2b87 /sql/sql_table.cc | |
| parent | 849273bcfb2e4e320db16d8be67202a3c5183882 (diff) | |
| parent | f8f1c01675858dcd30d2f29ed3cbc8284baf189e (diff) | |
| download | mariadb-git-d89f5a4e7a44dd4ea940f0a867d8fd706f774fb2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.mysql.fi:/home/my/mysql-5.0
sql/item.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/mysqldump.test:
Merge
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 16926200c4c..1b97de441e7 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1712,6 +1712,7 @@ TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, DBUG_ENTER("create_table_from_items"); tmp_table.alias= 0; + tmp_table.timestamp_field= 0; tmp_table.s= &tmp_table.share_not_to_be_used; tmp_table.s->db_create_options=0; tmp_table.s->blob_ptr_size= portable_sizeof_char_ptr; |