From f4ca9acdf1c0ecd6c1fb5ba32c265bf43ab520cc Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 10 Sep 2005 15:32:07 +0400 Subject: [PATCH 1/2] Fix a valgrind warning. --- sql/sql_select.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 28afec2f688..c012d90a2a5 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8041,7 +8041,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 && @@ -8051,7 +8051,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) { From e85f42c5e6b0f9d6be1bee5ada7870a5e8f64e55 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 10 Sep 2005 16:01:26 -0500 Subject: [PATCH 2/2] options.cc: Fix typo. server-tools/instance-manager/options.cc: Fix typo. --- server-tools/instance-manager/options.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc index 334b67e5d37..36fe0a89dda 100644 --- a/server-tools/instance-manager/options.cc +++ b/server-tools/instance-manager/options.cc @@ -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,