diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-10-07 14:41:04 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-10-07 14:41:04 -0400 |
| commit | cd6dc42fdf525fdcde2b054fdf5a39ab01e1e16b (patch) | |
| tree | aee830e15196c5c02851683cd1a732488dcbecd2 | |
| parent | bc4a57f01ace40255de2f8d7307254fd1d1d5bfa (diff) | |
| parent | 63ed77ca1d3d66148048dd46cf9f781fb5abe7f3 (diff) | |
| download | mariadb-git-cd6dc42fdf525fdcde2b054fdf5a39ab01e1e16b.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
| -rw-r--r-- | mysql-test/r/create.result | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index e6192eb6ccb..7b784e3c3ee 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -78,7 +78,7 @@ Field Type Null Key Default Extra x varchar(50) YES NULL describe t2; Field Type Null Key Default Extra -x char(50) YES NULL +x varchar(50) YES NULL drop table t2; create table t2 select now() as a , curtime() as b, curdate() as c , 1+1 as d , 1.0 + 1 as e , 33333333333333333 + 3 as f; describe t2; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 53c41482a36..bffe3cd7968 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3706,6 +3706,8 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, new_field->field_name=item->name; if (org_field->maybe_null()) new_field->flags&= ~NOT_NULL_FLAG; // Because of outer join + if (org_field->type()==FIELD_TYPE_VAR_STRING) + table->db_create_options|= HA_OPTION_PACK_RECORD; } return new_field; } |