bk commit into 5.0 tree (anozdrin:1.2422)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.0 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-27 21:50:21+04:00, anozdrin@stripped +3 -0
  Eliminate warnings in sql/.

  sql/set_var.cc@stripped, 2007-03-27 21:50:19+04:00, anozdrin@stripped +3 -0
    Eliminate warnings.

  sql/sql_base.cc@stripped, 2007-03-27 21:50:19+04:00, anozdrin@stripped +4 -2
    Eliminate warnings.

  sql/sql_insert.cc@stripped, 2007-03-27 21:50:19+04:00, anozdrin@stripped +3 -0
    Eliminate warnings.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	alik.opbmk
# Root:	/mnt/raid/alik/MySQL/devel/5.0-marvel

--- 1.373/sql/sql_base.cc	2007-03-24 18:16:48 +03:00
+++ 1.374/sql/sql_base.cc	2007-03-27 21:50:19 +04:00
@@ -3062,14 +3062,16 @@
               table_list->alias, name, item_name, (ulong) ref));
   Field_iterator_view field_it;
   field_it.set(table_list);
-  Query_arena *arena, backup;  
-  
+
   DBUG_ASSERT(table_list->schema_table_reformed ||
               (ref != 0 && table_list->view != 0));
   for (; !field_it.end_of_fields(); field_it.next())
   {
     if (!my_strcasecmp(system_charset_info, field_it.name(), name))
     {
+      Query_arena *arena= NULL;
+      Query_arena backup;
+
       // in PS use own arena or data will be freed after prepare
       if (register_tree_change)
         arena= thd->activate_stmt_arena_if_needed(&backup);

--- 1.227/sql/sql_insert.cc	2007-03-24 18:16:49 +03:00
+++ 1.228/sql/sql_insert.cc	2007-03-27 21:50:19 +04:00
@@ -2112,7 +2112,10 @@
 bool delayed_insert::handle_inserts(void)
 {
   int error;
+
   ulong max_rows;
+  LINT_INIT(max_rows);
+
   bool using_ignore= 0, using_opt_replace= 0;
   bool using_bin_log= mysql_bin_log.is_open();
   delayed_row *row;

--- 1.182/sql/set_var.cc	2007-03-23 18:12:56 +03:00
+++ 1.183/sql/set_var.cc	2007-03-27 21:50:19 +04:00
@@ -2030,6 +2030,7 @@
 bool sys_var_collation::check(THD *thd, set_var *var)
 {
   CHARSET_INFO *tmp;
+  LINT_INIT(tmp);
 
   if (var->value->result_type() == STRING_RESULT)
   {
@@ -2064,6 +2065,7 @@
 bool sys_var_character_set::check(THD *thd, set_var *var)
 {
   CHARSET_INFO *tmp;
+  LINT_INIT(tmp);
 
   if (var->value->result_type() == STRING_RESULT)
   {
@@ -2789,6 +2791,7 @@
 bool sys_var_thd_lc_time_names::check(THD *thd, set_var *var)
 {
   MY_LOCALE *locale_match;
+  LINT_INIT(locale_match);
 
   if (var->value->result_type() == INT_RESULT)
   {