bk commit into 6.0 tree (gkodinov:1.2794)

[kgeorge]

Below is the list of changes that have just been committed into a local
6.0 repository of gkodinov.  When gkodinov 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, 2008-01-30 14:44:17+02:00, gkodinov@stripped +4 -0
  Merge of bug 31326 5.1-opt -> 6.0-opt + some warnings removed

  sql/handler.h@stripped, 2008-01-30 14:44:12+02:00, gkodinov@stripped +2 -0
    Merge of bug 31326 5.1-opt -> 6.0-opt + some warnings removed

  sql/log_event_old.h@stripped, 2008-01-30 14:44:13+02:00, gkodinov@stripped +1 -0
    Merge of bug 31326 5.1-opt -> 6.0-opt + some warnings removed

  sql/opt_range.cc@stripped, 2008-01-30 14:44:13+02:00, gkodinov@stripped +2 -2
    Merge of bug 31326 5.1-opt -> 6.0-opt + some warnings removed

  sql/rpl_mi.cc@stripped, 2008-01-30 14:44:13+02:00, gkodinov@stripped +1 -1
    Merge of bug 31326 5.1-opt -> 6.0-opt + some warnings removed

diff -Nrup a/sql/handler.h b/sql/handler.h
--- a/sql/handler.h	2008-01-11 00:08:49 +02:00
+++ b/sql/handler.h	2008-01-30 14:44:12 +02:00
@@ -1023,6 +1023,8 @@ public:
   enum { MEM_COEFF=1 };
   enum { IMPORT_COEFF=1 };
 
+  COST_VECT() {}                              // keep gcc happy
+
   double total_cost() 
   {
     return IO_COEFF*io_count*avg_io_cost + CPU_COEFF * cpu_cost +
diff -Nrup a/sql/log_event_old.h b/sql/log_event_old.h
--- a/sql/log_event_old.h	2007-09-10 14:15:59 +03:00
+++ b/sql/log_event_old.h	2008-01-30 14:44:13 +02:00
@@ -26,6 +26,7 @@ class Old_rows_log_event
  public:
  
   virtual ~Old_rows_log_event() {}
+  Old_rows_log_event() {}                     // keep gcc happy
 
  protected:
   
diff -Nrup a/sql/opt_range.cc b/sql/opt_range.cc
--- a/sql/opt_range.cc	2008-01-11 00:08:49 +02:00
+++ b/sql/opt_range.cc	2008-01-30 14:44:13 +02:00
@@ -1078,7 +1078,7 @@ QUICK_SELECT_I::QUICK_SELECT_I()
 QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint key_nr,
                                        bool no_alloc, MEM_ROOT *parent_alloc,
                                        bool *create_error)
-  :dont_free(0),free_file(0),cur_range(NULL),last_range(0)
+  :free_file(0),cur_range(NULL),last_range(0),dont_free(0)
 {
   my_bitmap_map *bitmap;
   DBUG_ENTER("QUICK_RANGE_SELECT::QUICK_RANGE_SELECT");
@@ -7901,6 +7901,7 @@ QUICK_RANGE_SELECT *get_quick_select_for
   QUICK_RANGE *range;
   uint part;
   bool create_err= FALSE;
+  COST_VECT cost;
 
   old_root= thd->mem_root;
   /* The following call may change thd->mem_root */
@@ -7980,7 +7981,6 @@ QUICK_RANGE_SELECT *get_quick_select_for
 #endif
 
   quick->mrr_buf_size= thd->variables.read_rnd_buff_size;
-  COST_VECT cost;
   if (table->file->multi_range_read_info(quick->index, 1, (uint)records,
                                          &quick->mrr_buf_size,
                                          &quick->mrr_flags, &cost))
diff -Nrup a/sql/rpl_mi.cc b/sql/rpl_mi.cc
--- a/sql/rpl_mi.cc	2008-01-30 14:02:47 +02:00
+++ b/sql/rpl_mi.cc	2008-01-30 14:44:13 +02:00
@@ -31,7 +31,7 @@ int init_strvar_from_file(char *var, int
 Master_info::Master_info()
   :Slave_reporting_capability("I/O"),
    ssl(0), ssl_verify_server_cert(0), fd(-1),  io_thd(0), port(MYSQL_PORT),
-   connect_retry(DEFAULT_CONNECT_RETRY), inited(0), abort_slave(0),
+   connect_retry(DEFAULT_CONNECT_RETRY), inited(0), abort_slave(0)
 {
   host[0] = 0; user[0] = 0; password[0] = 0;
   ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;