diff options
| author | unknown <monty@mysql.com> | 2006-01-06 01:08:48 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-01-06 01:08:48 +0200 |
| commit | a0979fe1f0c566cf2d85cfe3dd35641afb28454b (patch) | |
| tree | 14416e5a83f9880e39f89a0bf5f03a8613ef7ce0 /sql/field.cc | |
| parent | afc24467b404a64b5ca4ce59b10dbaa17c0dac98 (diff) | |
| parent | 43886f1d92a76f3d45c6afd7df34d182a7c21cb7 (diff) | |
| download | mariadb-git-a0979fe1f0c566cf2d85cfe3dd35641afb28454b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/r/create.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/disabled.def:
Manual merge
sql/mysqld.cc:
Manual merge
sql/sp_head.cc:
Manual merge
sql/sql_trigger.cc:
Manual merge
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 8f9dc832520..1f3649e1b88 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6212,8 +6212,8 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table) This is done to ensure that ALTER TABLE will convert old VARCHAR fields to now VARCHAR fields. */ - if (new_field= new Field_varstring(field_length, maybe_null(), - field_name, new_table, charset())) + if ((new_field= new Field_varstring(field_length, maybe_null(), + field_name, new_table, charset()))) { /* delayed_insert::get_local_table() needs a ptr copied from old table. |