Commit 1dc04d11 authored by unknown's avatar unknown
Browse files

Merge 


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-ErrorMessages.hpp~9ab815d55a13433a:
  Auto merged
ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/log.cc:
  Auto merged
storage/innobase/os/os0sync.c:
  Auto merged
storage/ndb/include/Makefile.am:
  Auto merged
storage/ndb/include/kernel/signaldata/EventReport.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FsRef.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/SystemError.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/FsRef.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/trix/Trix.hpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
storage/ndb/src/kernel/error/Makefile.am:
  Auto merged
storage/ndb/src/kernel/vm/ArrayPool.hpp:
  Auto merged
storage/ndb/src/kernel/vm/CArray.hpp:
  Auto merged
storage/ndb/src/kernel/vm/ClusterConfiguration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
storage/ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Makefile.am:
  Auto merged
storage/ndb/src/kernel/vm/SafeCounter.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SafeCounter.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/kernel/vm/TimeQueue.cpp:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.hpp:
  Auto merged
storage/ndb/src/kernel/vm/pc.hpp:
  Auto merged
storage/ndb/src/mgmapi/Makefile.am:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  merge
extra/perror.c:
  merge
storage/ndb/include/mgmapi/ndb_logevent.h:
  merge
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  merge
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  merge
storage/ndb/src/mgmsrv/Services.hpp:
  SCCS merged
parents 47a3ddcf 282e2c02

config/ac-macros/ha_ndbcluster.m4

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ 
      AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])

      AC_DEFINE([HAVE_PARTITION_DB], [1], [Builds Partition DB])

      have_ndbcluster="yes"

      ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_builddir)/storage/ndb/include/ndbapi"

      ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_builddir)/storage/ndb/include/ndbapi -I\$(top_builddir)/storage/ndb/include/mgmapi"

      ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a"

      ndbcluster_system_libs=""

      ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la"

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1873,7 +1873,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ 
  realpath rename rint rwlock_init setupterm \

  shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \

  sighold sigset sigthreadmask \

  snprintf socket stpcpy strcasecmp strerror strnlen strpbrk strstr strtol \

  snprintf socket stpcpy strcasecmp strerror strsignal strnlen strpbrk strstr strtol \

  strtoll strtoul strtoull tell tempnam thr_setconcurrency vidattr)



#

extra/perror.c

+6 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <my_getopt.h>

#ifdef HAVE_NDBCLUSTER_DB

#include "../storage/ndb/src/ndbapi/ndberror.c"

#include "../storage/ndb/src/kernel/error/ndbd_exit_codes.c"

#endif



static my_bool verbose, print_all_codes;
@@ -235,8 +236,11 @@ int main(int argc,char *argv[]) 
#ifdef HAVE_NDBCLUSTER_DB

      if (ndb_code)

      {

	if (ndb_error_string(code, ndb_string,  sizeof(ndb_string)) < 0)

	if ((ndb_error_string(code, ndb_string, sizeof(ndb_string)) < 0) &&

	    (ndbd_exit_string(code, ndb_string, sizeof(ndb_string)) < 0))

	{

	    msg= 0;

	}

	else

	  msg= ndb_string;

      }

mysql-test/include/ctype_like_escape.inc

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#

# Bugs: #13046:

# LIKE pattern matching using prefix index doesn't return correct result

#

select @@collation_connection;

create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;

insert into t1 values('abcdef');

insert into t1 values('_bcdef');

insert into t1 values('a_cdef');

insert into t1 values('ab_def');

insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

-- should return ab_def

select c1 as c1u from t1 where c1 like 'ab\_def';

-- should return ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

drop table t1;

mysql-test/r/ctype_big5.result

+36 −0
Original line number Diff line number Diff line
@@ -89,6 +89,24 @@ select c1 from t1 where c1 like 'abcde111%' order by c1; 
c1

abcde111

drop table t1;

select @@collation_connection;

@@collation_connection

big5_chinese_ci

create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;

insert into t1 values('abcdef');

insert into t1 values('_bcdef');

insert into t1 values('a_cdef');

insert into t1 values('ab_def');

insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

select c1 as c1u from t1 where c1 like 'ab\_def';

c1u

ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

c2h

ab_def

drop table t1;

SET collation_connection='big5_bin';

create table t1 select repeat('a',4000) a;

delete from t1;
@@ -121,6 +139,24 @@ select c1 from t1 where c1 like 'abcde111%' order by c1; 
c1

abcde111

drop table t1;

select @@collation_connection;

@@collation_connection

big5_bin

create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;

insert into t1 values('abcdef');

insert into t1 values('_bcdef');

insert into t1 values('a_cdef');

insert into t1 values('ab_def');

insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

select c1 as c1u from t1 where c1 like 'ab\_def';

c1u

ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

c2h

ab_def

drop table t1;

SET NAMES big5;

CREATE TABLE t1 (a text) character set big5;

INSERT INTO t1 VALUES ('');