diff options
| author | monty@mysql.com <> | 2006-01-06 00:47:49 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-01-06 00:47:49 +0200 |
| commit | 6e22e29de669b95aefc4f5f7ce46420e52c99870 (patch) | |
| tree | cd157631ca39d533f8aa37ebb570f304e91c81e2 /sql/field.cc | |
| parent | 88eee63d8c02e5a4b3ac39c0ed31794dcf243a29 (diff) | |
| download | mariadb-git-6e22e29de669b95aefc4f5f7ce46420e52c99870.tar.gz | |
Review fixes of new pushed code
- Fixed tests
- Optimized new code
- Fixed some unlikely core dumps
- Better bug fixes for:
- #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
- #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null
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 b70e2a92618..9e73c132d68 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6204,8 +6204,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. |