From: Mattias Jonsson
Date: April 26 2011 10:04am
Subject: bzr push into mysql-trunk branch (mattias.jonsson:3340 to 3341)
List-Archive: http://lists.mysql.com/commits/136086
Message-Id: <201104261004.p3QA4OcJ030855@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3341 Mattias Jonsson	2011-04-26 [merge]
      merge

    modified:
      mysql-test/suite/parts/inc/partition_check_drop.inc
      mysql-test/suite/parts/inc/partition_layout_check1.inc
      mysql-test/suite/parts/inc/partition_layout_check2.inc
      sql/ha_partition.cc
 3340 MySQL Build Team	2011-04-26
      fix 35418/11748190

    modified:
      mysys/default.c
=== modified file 'mysql-test/suite/parts/inc/partition_check_drop.inc'
--- a/mysql-test/suite/parts/inc/partition_check_drop.inc	2011-04-23 20:44:45 +0000
+++ b/mysql-test/suite/parts/inc/partition_check_drop.inc	2011-04-26 10:01:10 +0000
@@ -37,7 +37,7 @@ if ($do_file_tests)
   eval SET @aux = load_file('$ls_file');
 
   # clean up
-  --remove_file $ls_file;
+  --remove_file $ls_file
 }
 if (!$do_file_tests)
 {

=== modified file 'mysql-test/suite/parts/inc/partition_layout_check1.inc'
--- a/mysql-test/suite/parts/inc/partition_layout_check1.inc	2011-04-23 20:44:45 +0000
+++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc	2011-04-26 10:01:10 +0000
@@ -47,7 +47,7 @@ if ($do_file_tests)
   eval SET @aux = load_file('$ls_file');
 
   # clean up
-  --remove_file $ls_file;
+  --remove_file $ls_file
 }
 if (!$do_file_tests)
 {

=== modified file 'mysql-test/suite/parts/inc/partition_layout_check2.inc'
--- a/mysql-test/suite/parts/inc/partition_layout_check2.inc	2011-04-23 20:44:45 +0000
+++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc	2011-04-26 10:01:10 +0000
@@ -45,7 +45,7 @@ if ($do_file_tests)
   eval SET @aux = load_file('$ls_file');
 
   # clean up
-  --remove_file $ls_file;
+  --remove_file $ls_file
 }
 if (!$do_file_tests)
 {

=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2011-04-23 20:44:45 +0000
+++ b/sql/ha_partition.cc	2011-04-26 10:01:10 +0000
@@ -2750,7 +2750,7 @@ void ha_data_partition_destroy(HA_DATA_P
 int ha_partition::open(const char *name, int mode, uint test_if_locked)
 {
   char *name_buffer_ptr;
-  int error;
+  int error= HA_ERR_INITIALIZATION;
   uint alloc_len;
   handler **file;
   char name_buff[FN_REFLEN];
@@ -2764,7 +2764,7 @@ int ha_partition::open(const char *name,
   m_open_test_lock= test_if_locked;
   m_part_field_array= m_part_info->full_part_field_array;
   if (get_from_handler_file(name, &table->mem_root, test(m_is_clone_of)))
-    DBUG_RETURN(1);
+    DBUG_RETURN(error);
   name_buffer_ptr= m_name_buffer_ptr;
   m_start_key.length= 0;
   m_rec0= table->record[0];
@@ -2775,7 +2775,7 @@ int ha_partition::open(const char *name,
   {
     if (!(m_ordered_rec_buffer= (uchar*)my_malloc(alloc_len, MYF(MY_WME))))
     {
-      DBUG_RETURN(1);
+      DBUG_RETURN(error);
     }
     {
       /*
@@ -2798,13 +2798,13 @@ int ha_partition::open(const char *name,
 
   /* Initialize the bitmap we use to minimize ha_start_bulk_insert calls */
   if (bitmap_init(&m_bulk_insert_started, NULL, m_tot_parts + 1, FALSE))
-    DBUG_RETURN(1);
+    DBUG_RETURN(error);
   bitmap_clear_all(&m_bulk_insert_started);
   /* Initialize the bitmap we use to keep track of locked partitions */
   if (bitmap_init(&m_locked_partitions, NULL, m_tot_parts, FALSE))
   {
     bitmap_free(&m_bulk_insert_started);
-    DBUG_RETURN(1);
+    DBUG_RETURN(error);
   }
   bitmap_clear_all(&m_locked_partitions);
   /* Initialize the bitmap we use to determine what partitions are locked */
@@ -2817,7 +2817,7 @@ int ha_partition::open(const char *name,
     {
       bitmap_free(&m_bulk_insert_started);
       bitmap_free(&m_locked_partitions);
-      DBUG_RETURN(1);
+      DBUG_RETURN(error);
     }
   }
 
@@ -2829,7 +2829,7 @@ int ha_partition::open(const char *name,
     alloc_len= (m_tot_parts + 1) * sizeof(handler*);
     if (!(m_file= (handler **) alloc_root(m_clone_mem_root, alloc_len)))
     {
-      error= 1;
+      error= HA_ERR_INITIALIZATION;
       goto err_alloc;
     }
     memset(m_file, 0, alloc_len);

No bundle (reason: useless for push emails).