1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge gluh@192.168.21.1:/usr/home/bk/mysql-4.1

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.uvar
This commit is contained in:
gluh@gluh.mysql.r18.ru
2003-02-17 15:07:01 +04:00
7 changed files with 28 additions and 22 deletions

View File

@ -4007,7 +4007,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
item->name,table,item->charset());
return new Field_string(item_sum->max_length,maybe_null,
item->name,table,item->charset());
case ROW_RESULT:
default:
// This case should never be choosen
DBUG_ASSERT(0);
return 0;
@ -4067,7 +4067,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
new_field= new Field_string(item->max_length,maybe_null,
item->name,table,item->str_value.charset());
break;
case ROW_RESULT:
default:
// This case should never be choosen
DBUG_ASSERT(0);
break;