mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  frost.snake.net:/private/tmp/merge-5.1
This commit is contained in:
paul@frost.snake.net 2005-09-10 19:30:02 -05:00
commit dc287e7caa
2 changed files with 2 additions and 3 deletions
Show stats 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,
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.",
(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,
uint convert_blob_length)
{
Item::Type orig_type;
Item::Type orig_type= type;
Item *orig_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;
item= item->real_item();
orig_type= type;
type= Item::FIELD_ITEM;
}
switch (type) {