Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999

BUILD/SETUP.sh

@@ -43,7 +43,13 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
 c_warnings="$global_warnings -Wunused"
 cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
 
+base_max_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"
+max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"
+max_no_es_configs="$max_leave_isam_configs --without-isam"
+max_configs="$max_no_es_configs --with-embedded-server"
+
 alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet
+amd64_cflags="-DBIG_TABLES"
 pentium_cflags="-mcpu=pentiumpro"
 pentium64_cflags="-mcpu=nocona -m64"
 ppc_cflags="-mpowerpc -mcpu=powerpc"
@@ -58,9 +64,11 @@ reckless_cflags="-O3 -fomit-frame-pointer "
 debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"
 
 base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
+amd64_cxxflags="-DBIG_TABLES"
 
 base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"
 static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
+amd64_configs=""
 alpha_configs=""	# Not used yet
 pentium_configs=""
 sparc_configs=""

BUILD/compile-amd64-debug-max

 #! /bin/sh
 path=`dirname $0`
 . "$path/SETUP.sh"
-amd64_cflags="-DBIG_TABLES"
-amd64_cxx_flags="-DBIG_TABLES"
-amd64_configs=""
-base_cxxflags="$amd64_cxx_flags $base_cxxflags"
-extra_flags="$amd64_cflags $debug_cflags"
+extra_flags="$amd64_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$amd64_configs $debug_configs"
-
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"
+extra_configs="$amd64_configs $debug_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-amd64-max

@@ -2,16 +2,7 @@
 
 path=`dirname $0`
 . "$path/SETUP.sh"
-amd64_cflags="-DBIG_TABLES"
-amd64_cxx_flags="-DBIG_TABLES"
-amd64_configs=""
-base_cxxflags="$amd64_cxx_flags $base_cxxflags"
-extra_flags="$amd64_cflags $fast_cflags -g"
-extra_configs="$amd64_configs"
-#strip=yes
-
-extra_configs="$extra_configs --with-innodb --with-berkeley-db \
-        --with-embedded-server --enable-thread-safe-client \
-        --with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_flags="$amd64_cflags $fast_cflags $max_cflags -g"
+extra_configs="$amd64_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-debug-max

@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
-
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"
+extra_configs="$pentium_configs $debug_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-debug-max-no-embedded

@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
-
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-openssl --with-raid"
+extra_configs="$pentium_configs $debug_configs $max_no_es_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-max

@@ -3,12 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $fast_cflags -g"
-extra_configs="$pentium_configs"
-#strip=yes
-
-extra_configs="$extra_configs --with-innodb --with-berkeley-db \
-	--with-embedded-server --enable-thread-safe-client \
-	--with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_flags="$pentium_cflags $fast_cflags $max_cflags -g"
+extra_configs="$pentium_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-valgrind-max

@@ -3,13 +3,13 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
 # We want to test isam when building with valgrind
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_configs="$extra_configs $max_leave_isam_configs --with-isam"
 
 . "$path/FINISH.sh"
 

BUILD/compile-ppc-debug-max

@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$ppc_cflags $debug_cflags"
+extra_flags="$ppc_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$debug_configs"
-
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"
+extra_configs="$debug_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-ppc-max

@@ -3,11 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$ppc_cflags $fast_cflags -g"
-#strip=yes
-
-extra_configs="$extra_configs --with-innodb --with-berkeley-db \
-	--with-embedded-server --enable-thread-safe-client \
-	--with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_flags="$ppc_cflags $fast_cflags $max_cflags -g"
+extra_configs="$extra_configs $max_configs"
 
 . "$path/FINISH.sh"

config/ac-macros/ha_ndbcluster.m4

@@ -61,7 +61,12 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   --without-ndb-debug   Disable special ndb debug features],
               [ndb_debug="$withval"],
               [ndb_debug="default"])
-                                                                                
+  AC_ARG_WITH([ndb-ccflags],
+              [
+  --with-ndb-ccflags    Extra CC options for ndb compile],
+              [ndb_cxxflags_fix=$withval],
+              [ndb_cxxflags_fix=])
+
   AC_MSG_CHECKING([for NDB Cluster options])
   AC_MSG_RESULT([])
                                                                                 

configure.in

@@ -361,7 +361,6 @@ AC_SUBST(INSTALL_SCRIPT)
 
 export CC CXX CFLAGS LD LDFLAGS AR
 
-ndb_cxxflags_fix=
 if test "$GXX" = "yes"
 then
   # mysqld requires -fno-implicit-templates.

libmysqld/Makefile.am

@@ -42,7 +42,7 @@ sqlexamplessources =	ha_example.cc ha_archive.cc ha_tina.cc
 noinst_HEADERS =	embedded_priv.h emb_qcache.h
 
 sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
-	ha_innodb.cc ha_berkeley.cc ha_heap.cc \
+	ha_innodb.cc ha_berkeley.cc ha_heap.cc ha_federated.cc \
 	ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \
 	hostname.cc init.cc password.c \
 	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \

mysql-test/r/subselect.result

@@ -2160,3 +2160,11 @@ WHERE f1 <> ALL ( SELECT SUM(f1) AS sf1 FROM t2 HAVING sf1 > 10000);
 f1
 NULL
 1
+drop table t1,t2;
+create table t1 (a1 int);
+create table t2 (b1 int);
+select * from t1 where a2 > any(select b1 from t2);
+ERROR 42S22: Unknown column 'a2' in 'scalar IN/ALL/ANY subquery'
+select * from t1 where a1 > any(select b1 from t2);
+a1
+drop table t1,t2;

mysql-test/r/view.result

@@ -1724,3 +1724,9 @@ a	b
 301	0
 drop view v3;
 drop tables t1,t2;
+create table t1(f1 int);
+create view v1 as select f1 from t1;
+select * from v1 where F1 = 1;
+f1
+drop view v1;
+drop table t1;

mysql-test/t/subselect.test

@@ -1417,3 +1417,14 @@ SELECT f1 FROM t1
 
 SELECT f1 FROM t1
    WHERE f1 <> ALL ( SELECT SUM(f1) AS sf1 FROM t2 HAVING sf1 > 10000);
+
+drop table t1,t2;
+# Test for BUG#7885: Server crash when 'any' subselect compared to
+# non-existant field.
+create table t1 (a1 int);
+create table t2 (b1 int);
+--error 1054
+select * from t1 where a2 > any(select b1 from t2);
+select * from t1 where a1 > any(select b1 from t2);
+drop table t1,t2;
+

mysql-test/t/view.test

@@ -1654,3 +1654,10 @@ select * from v3;
 
 drop view v3;
 drop tables t1,t2;
+
+# View field names should be case insensitive 
+create table t1(f1 int);
+create view v1 as select f1 from t1;
+select * from v1 where F1 = 1;
+drop view v1;
+drop table t1;

ndb/src/common/util/Bitmask.cpp

@@ -5,7 +5,7 @@ static
 void print(const Uint32 src[], Uint32 len, Uint32 pos = 0)
 {
   printf("b'");
-  for(int i = 0; i<len; i++)
+  for(unsigned i = 0; i<len; i++)
   {
     if(BitmaskImpl::get((pos + len + 31) >> 5, src, i+pos))
       printf("1");

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

@@ -4350,7 +4350,7 @@ Dbdict::execTAB_COMMITCONF(Signal* signal){
       }
       tAttr = aRec->nextAttrInTable;
     }
-    ndbrequire(sz == 2 * tabPtr.p->noOfPrimkey);
+    ndbrequire((int)sz == 2 * tabPtr.p->noOfPrimkey);
 
     LinearSectionPtr lsPtr[3];
     lsPtr[0].p = buf;

ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp

@@ -262,7 +262,7 @@ Dbtux::readKeyAttrs(const Frag& frag, TreeEnt ent, unsigned start, Data keyData)
       debugOut << endl;
       totalSize += 1 + dataSize;
     }
-    ndbassert(totalSize == ret);
+    ndbassert((int)totalSize == ret);
   }
 #endif
 }

ndb/src/mgmapi/mgmapi.cpp

@@ -314,8 +314,8 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
      */
     ndbout << "Error in mgm protocol parser. "
 	   << "cmd: '" << cmd
-	   << "' status=" << ctx.m_status
-	   << ", curr=" << ctx.m_currentToken
+	   << "' status=" << (Uint32)ctx.m_status
+	   << ", curr=" << (Uint32)ctx.m_currentToken
 	   << endl;
     DBUG_PRINT("info",("parser.parse returned NULL"));
   } 

ndb/src/mgmsrv/MgmtSrvr.cpp

@@ -2809,7 +2809,7 @@ MgmtSrvr::setConnectionDbParameter(int node1,
   ConfigValues::Iterator i2(_config->m_configValues->m_config, 
 			    iter.m_config);
 
-  if(i2.set(param, (unsigned)value) < 0) {
+  if(i2.set(param, (unsigned)value) == false) {
     msg.assign("Unable to set new value of parameter");
     return -1;
   }

ndb/src/ndbapi/Ndb.cpp

@@ -47,7 +47,7 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
 {
   Uint32        tNode;
   Uint32        tAnyAlive = 0;
-  int TretCode;
+  int TretCode= 0;
 
   if (tConNode != 0) {
     TretCode = NDB_connect(tConNode);
@@ -892,7 +892,7 @@ Ndb::opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op)
   DBUG_PRINT("enter", ("table=%u value=%llu op=%u", aTableId, opValue, op));
 
   NdbTransaction*     tConnection;
-  NdbOperation*      tOperation;
+  NdbOperation*      tOperation= 0; // Compiler warning if not initialized
   Uint64             tValue;
   NdbRecAttr*        tRecAttrResult;
   int                result;

ndb/src/ndbapi/NdbDictionaryImpl.cpp

@@ -1361,9 +1361,7 @@ NdbDictInterface::parseTableInfo(NdbTableImpl ** ret,
     }
 
     Uint32 topBit = (1 << 31);
-    for(i = 31; i>=0; i--){
-      if((fragCount & topBit) != 0)
-	  break;
+    for(; topBit && !(fragCount & topBit); ){
       topBit >>= 1;
     }
     impl->m_hashValueMask = topBit - 1;

ndb/src/ndbapi/TransporterFacade.cpp

@@ -473,12 +473,12 @@ void TransporterFacade::threadMainReceive(void)
 }
 
 TransporterFacade::TransporterFacade(NdbMgmHandle mgm_handle) :
+  m_mgm_handle(mgm_handle),
   theTransporterRegistry(0),
   theStopReceive(0),
   theSendThread(NULL),
   theReceiveThread(NULL),
-  m_fragmented_signal_id(0),
-  m_mgm_handle(mgm_handle)
+  m_fragmented_signal_id(0)
 {
   theOwnId = 0;
 

ndb/src/ndbapi/ndb_cluster_connection.cpp

@@ -491,7 +491,9 @@ int Ndb_cluster_connection::connect(int no_retries, int retry_delay_in_seconds,
     m_impl.m_transporter_facade->start_instance(nodeId, props);
     m_impl.init_nodes_vector(nodeId, *props);
 
-    for(int i=0;i<m_impl.m_transporter_facade->get_registry()->m_transporter_interface.size();i++)
+    for(unsigned i=0;
+	i<m_impl.m_transporter_facade->get_registry()->m_transporter_interface.size();
+	i++)
       ndb_mgm_set_connection_int_parameter(m_impl.m_config_retriever->get_mgmHandle(),
 					   nodeId,
 					   m_impl.m_transporter_facade->get_registry()

scripts/make_binary_distribution.sh

@@ -210,8 +210,10 @@ do
 done
 
 $CP mysql-test/include/*.inc $BASE/mysql-test/include
-$CP mysql-test/std_data/*.dat mysql-test/std_data/*.*001 $BASE/mysql-test/std_data
-$CP mysql-test/std_data/des_key_file $BASE/mysql-test/std_data
+$CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
+    mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
+    mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
+    $BASE/mysql-test/std_data
 $CP mysql-test/t/*test mysql-test/t/*.opt mysql-test/t/*.slave-mi mysql-test/t/*.sh $BASE/mysql-test/t
 $CP mysql-test/r/*result mysql-test/r/*.require $BASE/mysql-test/r
 

sql/item_subselect.cc

@@ -177,6 +177,8 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref)
     }
     fix_length_and_dec();
   }
+  else
+    return 1;
   uint8 uncacheable= engine->uncacheable();
   if (uncacheable)
   {
@@ -264,7 +266,6 @@ Item_singlerow_subselect::Item_singlerow_subselect(st_select_lex *select_lex)
 {
   DBUG_ENTER("Item_singlerow_subselect::Item_singlerow_subselect");
   init(select_lex, new select_singlerow_subselect(this));
-  max_columns= 1;
   maybe_null= 1;
   max_columns= UINT_MAX;
   DBUG_VOID_RETURN;

sql/sql_base.cc

@@ -2120,7 +2120,7 @@ find_field_in_table(THD *thd, TABLE_LIST *table_list,
     Field_translator *trans= table_list->field_translation;
     for (uint i= 0; i < num; i ++)
     {
-      if (strcmp(trans[i].name, name) == 0)
+      if (!my_strcasecmp(system_charset_info, trans[i].name, name))
       {
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
 	if (check_grants_view &&