Re-import 5.5.41 due to some fail in automatic git-buildpackage import

debian/changelog

+mariadb-5.5 (5.5.41-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Otto Kekäläinen <otto@seravo.fi>  Sat, 27 Dec 2014 15:59:46 +0200
+
 mariadb-5.5 (5.5.39-3) UNRELEASED; urgency=low
 
   * Updated Dutch translation by Frans Spiesschaert (Closes: #764010)

debian/control

@@ -12,6 +12,7 @@ Build-Depends: bison,
                dh-apparmor,
                hardening-wrapper,
                libaio-dev [linux-any],
+               libjemalloc-dev (>= 3.0.0),
                libjemalloc-dev [linux-any],
                libncurses5-dev (>= 5.0-6),
                libpam0g-dev,
@@ -22,8 +23,7 @@ Build-Depends: bison,
                perl,
                po-debconf,
                psmisc,
-               zlib1g-dev (>= 1:1.1.3-5),
-               libjemalloc-dev (>= 3.0.0)
+               zlib1g-dev (>= 1:1.1.3-5)
 Standards-Version: 3.9.5
 Homepage: http://mariadb.org/
 Vcs-Git: git://git.debian.org/git/pkg-mysql/mariadb-5.5.git

packaging/rpm-oel/mysql.spec.in

@@ -85,7 +85,7 @@ Name:           mysql-%{product_suffix}
 Summary:        A very fast and reliable SQL database server
 Group:          Applications/Databases
 Version:        @VERSION@
-Release:        4%{?commercial:.1}%{?dist}
+Release:        2%{?commercial:.1}%{?dist}
 License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
 Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
 URL:            http://www.mysql.com/

storage/tokudb/ft-index/ft/ft-ops.cc

@@ -853,11 +853,6 @@ void toku_ftnode_clone_callback(
         // messages to the fresh tree - ft verify code complains otherwise.
         toku_move_ftnode_messages_to_stale(ft, node);
     }
-    if (node->height > 0) {
-        // need to move messages here so that we don't serialize stale
-        // messages to the fresh tree - ft verify code complains otherwise.
-        toku_move_ftnode_messages_to_stale(ft, node);
-    }
     // clone partition
     toku_ftnode_clone_partitions(node, cloned_node);
 
@@ -1048,8 +1043,6 @@ void toku_ftnode_pe_est_callback(
     return;
 }
 
-static void ft_bnc_move_messages_to_stale(FT ft, NONLEAF_CHILDINFO bnc);
-
 // replace the child buffer with a compressed version of itself.
 static void compress_internal_node_partition(FTNODE node, int i, enum toku_compression_method compression_method) {
     // if we should evict, compress the

storage/tokudb/ha_tokudb_alter_56.cc

@@ -533,9 +533,6 @@ bool ha_tokudb::inplace_alter_table(TABLE *altered_table, Alter_inplace_info *ha
     if (error == 0 && ctx->optimize_needed) {
         error = do_optimize(ha_thd());
     }
-    if (error == 0 && ctx->optimize_needed) {
-        error = do_optimize(ha_thd());
-    }
 
 #if (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699) || \
     (50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799)