bk commit into 5.2 tree (cbell:1.2548)

[cbell]

Below is the list of changes that have just been committed into a local
5.2 repository of cbell. When cbell 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-06-29 12:34:39-04:00, cbell@mysql_cab_desk. +4 -0
  WL#3327 : Online Backup
  
  This patch corrects a few valgrind and test warnings found in pushbuild.

  mysql-test/r/backup_no_data.result@stripped, 2007-06-29 12:34:34-04:00, cbell@mysql_cab_desk. +0 -4
    WL#3327 : Online Backup
    
    This patch includes the corrected result file for the backup_no_data
    test.

  mysql-test/t/backup_no_data.test@stripped, 2007-06-29 12:34:35-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3327 : Online Backup
    
    This patch corrects the disable/enable warnings commands in the 
    backup_no_data test.

  sql/backup/be_default.cc@stripped, 2007-06-29 12:34:35-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3570 : Default Backup
    
    This patch corrects an error found while testing in valgrind. It adds
    a missing free() call to the previous malloc call.

  sql/backup/sql_backup.cc@stripped, 2007-06-29 12:34:36-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3327 : Online Backup
    
    This patch corrects a valgrind and a testing warning by freeing the
    table using in the add_all_dbs() method.

# 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:	cbell
# Host:	mysql_cab_desk.
# Root:	C:/source/c++/mysql-5.2_WL_3776

--- 1.4/sql/backup/be_default.cc	2007-06-29 12:34:45 -04:00
+++ 1.5/sql/backup/be_default.cc	2007-06-29 12:34:45 -04:00
@@ -692,6 +692,7 @@
         {
           ptr= (byte *)my_malloc(size, MYF(MY_WME));
           memcpy(cur_table->record[0], (byte *)buf.data + META_SIZE, size);
+          my_free(ptr, MYF(0));
           mode= CHECK_BLOBS;
           DBUG_RETURN(PROCESSING);
         }

--- 1.1/mysql-test/r/backup_no_data.result	2007-06-29 12:34:45 -04:00
+++ 1.2/mysql-test/r/backup_no_data.result	2007-06-29 12:34:45 -04:00
@@ -1,6 +1,4 @@
 DROP DATABASE IF EXISTS empty_db;
-Warnings:
-Note	1008	Can't drop database 'empty_db'; database doesn't exist
 CREATE DATABASE empty_db;
 BACKUP DATABASE empty_db TO 'empty_db.bak';
 Backup Summary
@@ -80,8 +78,6 @@
 ) ENGINE=myisam DEFAULT CHARSET=latin1;
 USE empty_db;
 DROP VIEW IF EXISTS v1;
-Warnings:
-Note	1051	Unknown table 'empty_db.v1'
 CREATE VIEW v1 AS SELECT * FROM test.t1;
 BACKUP DATABASE empty_db TO 'empty_db.bak';
 Backup Summary

--- 1.3/mysql-test/t/backup_no_data.test	2007-06-29 12:34:45 -04:00
+++ 1.4/mysql-test/t/backup_no_data.test	2007-06-29 12:34:45 -04:00
@@ -6,9 +6,9 @@
 # save empty test database on the side
 --exec cp -rf $MYSQLTEST_VARDIR/master-data/test $MYSQLTEST_VARDIR/test.orig
 
---disable warnings
+--disable_warnings
 DROP DATABASE IF EXISTS empty_db;
---enable warnings
+--enable_warnings
 
 CREATE DATABASE empty_db;
 
@@ -54,9 +54,9 @@
 
 USE empty_db;
 
---disable warnings
+--disable_warnings
 DROP VIEW IF EXISTS v1;
---enable warnings
+--enable_warnings
 
 CREATE VIEW v1 AS SELECT * FROM test.t1;
 

--- 1.11/sql/backup/sql_backup.cc	2007-06-29 12:34:46 -04:00
+++ 1.12/sql/backup/sql_backup.cc	2007-06-29 12:34:46 -04:00
@@ -686,8 +686,8 @@
 
  finish:
 
-  if (ha)
-    ha->close();
+  if (db_table)
+    ::free_tmp_table(m_thd, db_table);
 
   if (res)
     m_state= ERROR;