database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0

Browse Source 
into  frost.snake.net:/private/tmp/merge-5.1


sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2005-09-10 19:30:02 -05:00
parent 72ad93a076 e85f42c5e6
commit bf0562f20d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-tools/instance-manager/options.cc
View File

@@ -106,7 +106,7 @@ static struct my_option my_long_options[] =
(gptr *) &Options::port_number, (gptr *) &Options::port_number, (gptr *) &Options::port_number, (gptr *) &Options::port_number,
0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 }, 0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },
{ "password-file", OPT_PASSWORD_FILE, "Look for Instane Manager users" { "password-file", OPT_PASSWORD_FILE, "Look for Instance Manager users"
" and passwords here.", " and passwords here.",
(gptr *) &Options::password_file_name, (gptr *) &Options::password_file_name,
(gptr *) &Options::password_file_name, (gptr *) &Options::password_file_name,

3
sql/sql_select.cc
View File

@@ -8056,7 +8056,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
bool table_cant_handle_bit_fields, bool table_cant_handle_bit_fields,
uint convert_blob_length) uint convert_blob_length)
{ {
Item::Type orig_type; Item::Type orig_type= type;
Item *orig_item; Item *orig_item;
if (type != Item::FIELD_ITEM && if (type != Item::FIELD_ITEM &&
@@ -8066,7 +8066,6 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
{ {
orig_item= item; orig_item= item;
item= item->real_item(); item= item->real_item();
orig_type= type;
type= Item::FIELD_ITEM; type= Item::FIELD_ITEM;
} }
switch (type) { switch (type) {