bzr commit into mysql-6.0-backup branch (rsomla:2649)

[Rafal Somla]

#At file:///ext/mysql/bzr/mysql-6.0-backup/

 2649 Rafal Somla	2008-07-05 [merge]
      Auto merge.
modified:
  include/config-win.h
  mysql-test/t/backup_triggers_and_events.test
  mysql-test/t/disabled.def
  sql/si_objects.cc
  sql/si_objects.h

=== modified file 'include/config-win.h'
--- a/include/config-win.h	2008-07-02 11:27:17 +0000
+++ b/include/config-win.h	2008-07-05 08:41:26 +0000
@@ -35,6 +35,7 @@
 #include <fcntl.h>
 #include <io.h>
 #include <malloc.h>
+#include <stat.h>
 
 #define HAVE_SMEM 1
 

=== modified file 'mysql-test/t/backup_triggers_and_events.test'
--- a/mysql-test/t/backup_triggers_and_events.test	2008-06-26 15:52:25 +0000
+++ b/mysql-test/t/backup_triggers_and_events.test	2008-07-05 08:51:51 +0000
@@ -8,7 +8,7 @@
 
 --disable_warnings
 --error 0,1
---remove_file $MYSQL_TEST_DIR/var/master-data/db.bak
+remove_file $MYSQL_TEST_DIR/var/master-data/db.bak;
 --enable_warnings
 
 SET GLOBAL event_scheduler=off;
@@ -211,4 +211,4 @@ DROP TRIGGER test.trg;
 DROP TABLE test.logt;
 DROP TABLE test.t1;
 DROP DATABASE db;
---remove_file $MYSQL_TEST_DIR/var/master-data/db.bak
+remove_file $MYSQL_TEST_DIR/var/master-data/db.bak;

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2008-07-01 13:34:36 +0000
+++ b/mysql-test/t/disabled.def	2008-07-05 08:51:51 +0000
@@ -37,5 +37,4 @@ sort_buffer_size_basic_32   : Bug#36875 
 key_buffer_size_basic_32    : Bug#36876 main.key_buffer_size_basic_32 fails on some systems
 max_heap_table_size_basic_32 : Bug#36877 main.max_heap_table_size_basic_32 fails on some systems
 tmp_table_size_basic_32     : Bug#36878 main.tmp_table_size_basic_32 fails on some systems
-backup_triggers_and_events  : Bug#37762 2008-07-01 rafal Test fails on remove_file for unknown reasons
 backup_tablespace           : Bug#36973 2008-07-01 rafal

=== modified file 'sql/si_objects.cc'
--- a/sql/si_objects.cc	2008-07-02 11:41:05 +0000
+++ b/sql/si_objects.cc	2008-07-05 08:41:26 +0000
@@ -3122,7 +3122,7 @@ TABLE_LIST *Name_locker::build_table_lis
   DBUG_ENTER("Name_locker::build_table_list()");
   
   List_iterator<Obj> it(*tables);
-  while (tbl= it++)
+  while ((tbl= it++))
   {
     TABLE_LIST *ptr= (TABLE_LIST*)my_malloc(sizeof(TABLE_LIST), MYF(MY_WME));
     DBUG_ASSERT(ptr);  // FIXME: report error instead
@@ -3143,6 +3143,18 @@ TABLE_LIST *Name_locker::build_table_lis
   DBUG_RETURN(tl);
 }
 
+void Name_locker::free_table_list(TABLE_LIST *tl)
+{
+  TABLE_LIST *ptr= tl;
+
+  while (ptr)
+  {
+    tl= tl->next_global;
+    my_free(ptr, MYF(0));
+    ptr= tl;
+  }
+}
+
 /**
   Gets name locks on table list.
 

=== modified file 'sql/si_objects.h'
--- a/sql/si_objects.h	2008-06-25 13:59:45 +0000
+++ b/sql/si_objects.h	2008-07-05 08:41:26 +0000
@@ -614,7 +614,11 @@ class Name_locker
 {
 public:
   Name_locker(THD *thd) { m_thd= thd; }
-  ~Name_locker() { my_free(m_table_list, MYF(0)); }
+  ~Name_locker() 
+  { 
+    free_table_list(m_table_list);
+    m_table_list= NULL;
+  }
 
   /*
     Gets name locks on table list.
@@ -634,6 +638,7 @@ private:
     Builds a table list from the list of objects passed to constructor.
   */
   TABLE_LIST *build_table_list(List<Obj> *tables, thr_lock_type lock);
+  void free_table_list(TABLE_LIST*);
 };
 
 } // obs namespace