bzr commit into mysql-6.0-backup branch (cbell:2686) WL#4296

[Chuck Bell]

#At file:///C:/source/bzr/mysql-6.0-wl-4296/

 2686 Chuck Bell	2008-08-28
      Pushbuild fixes for WL#4296.
      
      Fixes warnings on sapsrv machines.
      Fixes backup_log test failure on sapsrv2 machine.
modified:
  mysql-test/r/backup_logs.result
  mysql-test/t/backup_logs.test
  sql/backup/logger.h
  sql/log.cc
  sql/set_var.cc
  sql/si_logs.cc

per-file messages:
  mysql-test/r/backup_logs.result
    Corrected results due to changed field type.
  mysql-test/t/backup_logs.test
    Corrected column size for temporary table.
  sql/backup/logger.h
    Removed unused variable.
  sql/log.cc
    Removed unused variables.
  sql/set_var.cc
    Removed unused variable.
    Initialized variables (for warning of 'may not be set'.
  sql/si_logs.cc
    Removed unused variable.
=== modified file 'mysql-test/r/backup_logs.result'
--- a/mysql-test/r/backup_logs.result	2008-08-27 17:35:10 +0000
+++ b/mysql-test/r/backup_logs.result	2008-08-28 15:13:31 +0000
@@ -35,7 +35,7 @@ con1: Create table and new users.
 CREATE TABLE backup_logs.t1 (a char(30)) ENGINE=MYISAM;
 CREATE TABLE backup_logs.t2 (a char(30)) ENGINE=INNODB;
 CREATE TABLE backup_logs.t3 (a char(30)) ENGINE=MEMORY;
-CREATE TABLE backup_logs.t1_res (id INT) ENGINE=MEMORY;
+CREATE TABLE backup_logs.t1_res (id bigint(20)) ENGINE=MEMORY;
 INSERT INTO backup_logs.t1 VALUES ("01 Test #1 - progress");
 INSERT INTO backup_logs.t1 VALUES ("02 Test #1 - progress");
 INSERT INTO backup_logs.t1 VALUES ("03 Test #1 - progress");
@@ -108,7 +108,7 @@ backup_state	complete
 operation	backup
 error_num	0
 num_objects	4
-total_bytes	3977
+total_bytes	3981
 validity_point_time	#
 start_time	#
 stop_time	#
@@ -168,7 +168,7 @@ backup_state	complete
 operation	restore
 error_num	0
 num_objects	4
-total_bytes	1489
+total_bytes	1493
 validity_point_time	#
 start_time	#
 stop_time	#

=== modified file 'mysql-test/t/backup_logs.test'
--- a/mysql-test/t/backup_logs.test	2008-08-27 17:35:10 +0000
+++ b/mysql-test/t/backup_logs.test	2008-08-28 15:13:31 +0000
@@ -60,7 +60,7 @@ CREATE DATABASE backup_logs;
 CREATE TABLE backup_logs.t1 (a char(30)) ENGINE=MYISAM;
 CREATE TABLE backup_logs.t2 (a char(30)) ENGINE=INNODB;
 CREATE TABLE backup_logs.t3 (a char(30)) ENGINE=MEMORY;
-CREATE TABLE backup_logs.t1_res (id INT) ENGINE=MEMORY;
+CREATE TABLE backup_logs.t1_res (id bigint(20)) ENGINE=MEMORY;
 
 INSERT INTO backup_logs.t1 VALUES ("01 Test #1 - progress"); 
 INSERT INTO backup_logs.t1 VALUES ("02 Test #1 - progress"); 

=== modified file 'sql/backup/logger.h'
--- a/sql/backup/logger.h	2008-08-27 17:30:49 +0000
+++ b/sql/backup/logger.h	2008-08-28 15:13:31 +0000
@@ -289,8 +289,6 @@ void Logger::report_driver(const char *d
 inline
 int Logger::init(enum_type type, const LEX_STRING path, const char *query)
 {
-  ulonglong backup_id= 0;
-
   if (m_state != CREATED)
     return 0;
 

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2008-08-27 17:30:49 +0000
+++ b/sql/log.cc	2008-08-28 15:13:31 +0000
@@ -3516,7 +3516,6 @@ ulonglong MYSQL_BACKUP_LOG::get_next_bac
 {
   ulonglong id= 0;
   char buff[FN_REFLEN], *file_path;
-  int error= 0;
   File file= 0;
 
   /*
@@ -3565,8 +3564,7 @@ ulonglong MYSQL_BACKUP_LOG::get_next_bac
     {
       ulonglong read_id= 0;
       my_seek(file, 0, 0, MYF(MY_WME));
-      size_t read_len= my_read(file, (uchar *)&read_id, sizeof(ulonglong), 
-        MYF(MY_WME|MY_NABP));
+      my_read(file, (uchar *)&read_id, sizeof(ulonglong), MYF(MY_WME|MY_NABP));
       id= uint8korr(&read_id);
       id++;
     }
@@ -3601,7 +3599,7 @@ err:
 err_end:
   m_next_id= id;
   pthread_mutex_unlock(&LOCK_backupid);
-  DBUG_PRINT("backup_log",("The next id is %lu.\n", id));
+  DBUG_PRINT("backup_log",("The next id is %lu.\n", (ulong)id));
   return id;
 }
 

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2008-08-27 17:30:49 +0000
+++ b/sql/set_var.cc	2008-08-28 15:13:31 +0000
@@ -2458,7 +2458,7 @@ static int  sys_check_log_path(THD *thd,
   char path[FN_REFLEN], buff[FN_REFLEN];
   MY_STAT f_stat;
   String str(buff, sizeof(buff), system_charset_info), *res;
-  const char *log_file_str;
+  const char *log_file_str= 0;
   size_t path_length;
 
   if (!(res= var->value->val_str(&str)))
@@ -2527,8 +2527,8 @@ bool update_sys_var_str_path(THD *thd, s
 			     set_var *var, const char *log_ext,
 			     bool log_state, uint log_type)
 {
-  MYSQL_QUERY_LOG *file_log;
-  MYSQL_BACKUP_LOG *backup_log;
+  MYSQL_QUERY_LOG *file_log= 0;
+  MYSQL_BACKUP_LOG *backup_log= 0;
   char buff[FN_REFLEN];
   char *res= 0, *old_value=(char *)(var ? var->value->str_value.ptr() : 0);
   bool result= 0;

=== modified file 'sql/si_logs.cc'
--- a/sql/si_logs.cc	2008-08-27 17:30:49 +0000
+++ b/sql/si_logs.cc	2008-08-28 15:13:31 +0000
@@ -31,7 +31,6 @@ Backup_log::Backup_log(THD *thd, 
                        const LEX_STRING path, 
                        const char *query)
 {
-  ulonglong backup_id= 0;
   m_thd= thd;
 
   bzero(&m_op_hist, sizeof(st_backup_history));