From: Mattias Jonsson
Date: April 26 2011 8:21am
Subject: bzr commit into mysql-5.1 branch (mattias.jonsson:3670) Bug#11766249
List-Archive: http://lists.mysql.com/commits/136066
X-Bug: 11766249
Message-Id: <201104260821.p3Q8LGBT010909@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1435081016=="

--===============1435081016==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///C:/ade/mysql-bzr/topush-5.1/ based on revid:mattias.jonsson@stripped

 3670 Mattias Jonsson	2011-04-26
      post fix for werror build for bug#11766249.

    modified:
      sql/ha_partition.cc
=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2011-04-20 16:00:50 +0000
+++ b/sql/ha_partition.cc	2011-04-26 08:21:09 +0000
@@ -2587,7 +2587,7 @@ void ha_data_partition_destroy(void *ha_
 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];
@@ -2601,7 +2601,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];
@@ -2612,7 +2612,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);
     }
     {
       /*
@@ -2635,7 +2635,7 @@ 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 determine what partitions are used */
   if (!m_is_clone_of)
@@ -2644,7 +2644,7 @@ int ha_partition::open(const char *name,
     if (bitmap_init(&(m_part_info->used_partitions), NULL, m_tot_parts, TRUE))
     {
       bitmap_free(&m_bulk_insert_started);
-      DBUG_RETURN(1);
+      DBUG_RETURN(error);
     }
     bitmap_set_all(&(m_part_info->used_partitions));
   }


--===============1435081016==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   sfxlilrwwwst7hfd
# target_branch: file:///C:/ade/mysql-bzr/topush-5.1/
# testament_sha1: 76636c95900c42b7efe7b319b318951993ab625f
# timestamp: 2011-04-26 10:21:18 +0200
# source_branch: file:///C:/ade/mysql-bzr/b59297-51/
# base_revision_id: mattias.jonsson@stripped\
#   m0vrgdyqj9tvfs6d
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYfDyH0AAaFfgFAQWGP//3b3
lhC////wUAO5XuyHdATnTCSUaTKn5MjTTU8ImEwKep6h6nlHqZlM1G1AZKNMJhGk1PSPUMjTQANA
AAAJIgKZDQwVPU2KB6hoNDQADQNDmEwCYATCYTTAAAJk00DCSkaaNJknpk09KNNqAAeoAAaDTQgF
u/NDfX89Zlfelv2vrBSxnp31ecxoawTort66MzC+3yS7Iz6H4MnZ2NTcbmm8I6O/h2FvxbL+/f/Q
xwqyG7kdNN+Km8PMLrxC7RdCM7CO3tYS+xXVfVzxF4YIsbolakPkkbo1lXlx40WhmYULHlJCi3nr
0DtjsKFBFyhHiGCaJ45RIjd8RwVKVLA0Y5BDRXGS/HfQI9xMN4muXN10BYgkinzKXnUIfMdsYCx+
vz5xuSqCU15VuYZKXUMwiFm4XdymSWDqzZJZ4uUEwr6VIbtwtRyJ2RtZbFdeYEpOnGg2sznNolLr
4EoqI4UiEWPmLVlaGIfWMVVI0IPrOKBKJvXP7cX4gbNAyokg7AJvhouRliCSA0oFLnSBe7WLZSIw
Gg/wtkIhohLMgxOHLpF7kttMX8ANzAxEChIHIpGRchDK7WJHLtI8GdThOVQeqvCAbiPwtDlCh0IR
SqgidIXQYUMRZEEMTO27w3lOerDdbyqWnjuckdPfrFKyY9A6fjmzQd/4GsMutrIam/XjMGuseE4Y
5GyxhyBQDWyagtz1I2L69HDnlnaAyfL5jluOHnqSI+JK+HG9efhmYCAFpXdkiqQ2vn0o5bszqd7/
kbQIVAxw9FYcCD814fBmSIUi7afel4pa9iyRyLkQJ59XKZ09NiP6RkPPEeanQtFh4zVXH/hBHz0S
VT6GemkDLpgJLceC+w/gP1ZBLIx2Y1laZdS5hoy/73DXkx2kgRJ6gmKmYymotRrZxkLMpKTd9M5q
xvBrxJrxWLFp7FipRRmKItAwfGMu1iwJY1bK8CaiHkmsgzlE62CcVUBK9mtndRCmVgPLNI6TstiR
cOqLA5h0AeD4g3R6Qw/BaKszRSvJxFyZtLKHyaBkUJyspbQWW4r3OKMhM4WAxCzytCNlWEzQUckM
yZadVZyMgWdBMkN5u39pFDja7MjtSIBBdLpteu1bb8HZclInwrLfJ5c/IFvSVkZsjNMANVJDtFg0
llrTHjyKhgCwmBbpBQ3UohIwLrmW5gcWc1cAai8FQXPm1bLwV3UKGlF0tDMJ34EG05l/ipbIFjYb
k6ewLQgyjQF6Fgr/XwM4lm/xraSNK2FlDsW3bAFYKx4phkyaugrL2LAzPJf8XckU4UJCHw8h9A==


--===============1435081016==--