diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-08-12 12:03:05 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-08-12 12:03:05 +0200 |
| commit | abc73040b51372ad8390604da6b88a76c6bcd1fb (patch) | |
| tree | f460aa465ae53a1bd1b76d6f4cf144dd0a6957dc /sql | |
| parent | f09fc5000413a4daaa401997968fc8f13def2f2c (diff) | |
| parent | dd10de57d37ccc82bad16f451aa4c8db91e694c2 (diff) | |
| download | mariadb-git-abc73040b51372ad8390604da6b88a76c6bcd1fb.tar.gz | |
manual merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_partition.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index a181a6b3f13..61766e5c509 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -6077,6 +6077,9 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, lpt->pack_frm_len= 0; thd->work_part_info= part_info; + /* Never update timestamp columns when alter */ + table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET; + if (fast_alter_partition & HA_PARTITION_ONE_PHASE) { /* |