# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sergii@pisem.net-20100802202047-rm609k322sd83e8e
# target_branch: lp:maria/5.2
# testament_sha1: 18b7a266ec9b4152c909e7596672c3cc78b6aa97
# timestamp: 2010-08-02 23:22:52 +0300
# base_revision_id: igor@askmonty.org-20100726173415-tkk3534ie8bzeleb
# 
# Begin patch
=== modified file 'BUILD/SETUP.sh'
--- BUILD/SETUP.sh	2010-03-30 16:16:57 +0000
+++ BUILD/SETUP.sh	2010-08-02 20:20:47 +0000
@@ -91,8 +91,8 @@
 get_make_parallel_flag
 
 # SSL library to use.--with-ssl will select our bundled yaSSL
-# implementation of SSL. To use openSSl you will nee too point out
-# the location of openSSL headers and lbs on your system.
+# implementation of SSL. To use OpenSSL you will need to specify
+# the location of OpenSSL headers and libs on your system.
 # Ex --with-ssl=/usr
 SSL_LIBRARY=--with-ssl
 
@@ -178,8 +178,7 @@
 max_no_qc_configs="$SSL_LIBRARY --with-plugins=max --without-query-cache"
 max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server --with-libevent"
 max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-libevent"
-# Disable NDB in maria max builds
-max_configs=$max_no_ndb_configs
+all_configs="$SSL_LIBRARY --with-plugins=max --with-plugin-ndbcluster --with-embedded-server --with-libevent"
 
 #
 # CPU and platform specific compilation flags.

=== added file 'BUILD/compile-amd64-debug-all'
--- BUILD/compile-amd64-debug-all	1970-01-01 00:00:00 +0000
+++ BUILD/compile-amd64-debug-all	2010-08-02 20:20:47 +0000
@@ -0,0 +1,7 @@
+#! /bin/sh
+path=`dirname $0`
+. "$path/SETUP.sh"
+extra_flags="$amd64_cflags $debug_cflags"
+extra_configs="$amd64_configs $debug_configs $all_configs"
+
+. "$path/FINISH.sh"

=== added file 'BUILD/compile-pentium-debug-all'
--- BUILD/compile-pentium-debug-all	1970-01-01 00:00:00 +0000
+++ BUILD/compile-pentium-debug-all	2010-08-02 20:20:47 +0000
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+path=`dirname $0`
+set -- "$@" --with-debug=full
+. "$path/SETUP.sh"
+
+extra_flags="$pentium_cflags $debug_cflags"
+extra_configs="$pentium_configs $debug_configs $all_configs $error_inject --with-experimental-collations"
+
+. "$path/FINISH.sh"

=== added file 'BUILD/compile-pentium64-debug-all'
--- BUILD/compile-pentium64-debug-all	1970-01-01 00:00:00 +0000
+++ BUILD/compile-pentium64-debug-all	2010-08-02 20:20:47 +0000
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+path=`dirname $0`
+set -- "$@" --with-debug=full
+. "$path/SETUP.sh"
+
+extra_flags="$pentium64_cflags $debug_cflags"
+extra_configs="$pentium_configs $debug_configs $all_configs"
+
+extra_configs="$extra_configs "
+CC="$CC --pipe"
+. "$path/FINISH.sh"

=== modified file 'storage/ndb/include/ndbapi/NdbDictionary.hpp'
--- storage/ndb/include/ndbapi/NdbDictionary.hpp	2007-12-07 10:05:19 +0000
+++ storage/ndb/include/ndbapi/NdbDictionary.hpp	2010-08-02 20:20:47 +0000
@@ -20,7 +20,7 @@
 
 class Ndb;
 struct charset_info_st;
-typedef struct charset_info_st CHARSET_INFO;
+typedef const struct charset_info_st CHARSET_INFO;
 
 /**
  * @class NdbDictionary

=== modified file 'storage/ndb/include/util/NdbSqlUtil.hpp'
--- storage/ndb/include/util/NdbSqlUtil.hpp	2006-12-23 19:20:40 +0000
+++ storage/ndb/include/util/NdbSqlUtil.hpp	2010-08-02 20:20:47 +0000
@@ -20,7 +20,7 @@
 #include <kernel/ndb_limits.h>
 
 struct charset_info_st;
-typedef struct charset_info_st CHARSET_INFO;
+typedef const struct charset_info_st CHARSET_INFO;
 
 class NdbSqlUtil {
 public:

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp'
--- storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2008-02-06 12:06:05 +0000
+++ storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2010-08-02 20:20:47 +0000
@@ -2249,7 +2249,7 @@
 	Uint32 TattrDesc1 = tableDescriptor[TattrDescrIndex].tabDescr;
 	Uint32 TattrDesc2 = tableDescriptor[TattrDescrIndex+1].tabDescr;
 	Uint32 typeId = AttributeDescriptor::getType(TattrDesc1);
-	void * cs = 0;
+	const void * cs = 0;
 	if(AttributeOffset::getCharsetFlag(TattrDesc2))
 	{
 	  Uint32 pos = AttributeOffset::getCharsetPos(TattrDesc2);

# Begin bundle
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