diff options
| author | unknown <jani@hundin.mysql.fi> | 2006-04-30 16:20:26 +0300 |
|---|---|---|
| committer | unknown <jani@hundin.mysql.fi> | 2006-04-30 16:20:26 +0300 |
| commit | cdd0cde8b6684241d3bf754b4991fd2575ae3464 (patch) | |
| tree | b4a6a4a02b14404cd5dc4160494652b872ef27b8 /sql | |
| parent | 180cecdc1c41cfd0810c77b7513397e29abc2d4b (diff) | |
| parent | a8e6eb89837b5a0f5a9b4b07b7f753960e27d012 (diff) | |
| download | mariadb-git-cdd0cde8b6684241d3bf754b4991fd2575ae3464.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jani/mysql-4.1
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 4 | ||||
| -rw-r--r-- | sql/sql_show.cc | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index f845cdd0c5d..bf68a102537 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -3207,10 +3207,6 @@ ulong fix_sql_mode(ulong sql_mode) MODE_IGNORE_SPACE | MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS | MODE_NO_FIELD_OPTIONS); - if (sql_mode & MODE_MYSQL40) - sql_mode|= MODE_NO_FIELD_OPTIONS; - if (sql_mode & MODE_MYSQL323) - sql_mode|= MODE_NO_FIELD_OPTIONS; return sql_mode; } diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 268292022e4..ecdf74a1fef 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1344,8 +1344,8 @@ store_create_info(THD *thd, TABLE *table, String *packet) has_default= (field->type() != FIELD_TYPE_BLOB && field->unireg_check != Field::NEXT_NUMBER && - !((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)) && - has_now_default)); + !((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)) + && has_now_default)); if (has_default) { @@ -1374,8 +1374,7 @@ store_create_info(THD *thd, TABLE *table, String *packet) packet->append(tmp); } - if (!(thd->variables.sql_mode & MODE_NO_FIELD_OPTIONS) && - table->timestamp_field == field && + if (!limited_mysql_mode && table->timestamp_field == field && field->unireg_check != Field::TIMESTAMP_DN_FIELD) packet->append(" on update CURRENT_TIMESTAMP",28); |