database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge mysql.com:/home/ram/work/b19690/b19690.5.0

Browse Source 
into  mysql.com:/home/ram/work/b19690/b19690.5.1
This commit is contained in:
ramil/ram@ramil.myoffice.izhnet.ru
2007-01-31 12:53:36 +04:00
parent 46b3a3d7dd 0bd1c03e7e
commit 30f904eb2d
11 changed files with 176 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@ -8761,6 +8761,8 @@ Field *create_tmp_field_from_field(THD *thd, Field *org_field,
if (org_field->type() == MYSQL_TYPE_VAR_STRING ||
org_field->type() == MYSQL_TYPE_VARCHAR)
table->s->db_create_options|= HA_OPTION_PACK_RECORD;
else if (org_field->type() == FIELD_TYPE_DOUBLE)
((Field_double *) new_field)->not_fixed= TRUE;
}
return new_field;
}
@ -8801,7 +8803,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table,
switch (item->result_type()) {
case REAL_RESULT:
new_field= new Field_double(item->max_length, maybe_null,
item->name, item->decimals);
item->name, item->decimals, TRUE);
break;
case INT_RESULT:
/* Select an integer type with the minimal fit precision */