Commit c59ae65d authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/my/mysql-5.1


sql/handler.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents 4eccd2ae d25c405d

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1614,3 +1614,5 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

libmysqld/partition_info.cc

storage/ndb/src/common/util/testBitmask.cpp

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -334,6 +334,9 @@ then 
  # mysqld requires -fno-implicit-templates.

  # Disable exceptions as they seams to create problems with gcc and threads.

  # mysqld doesn't use run-time-type-checking, so we disable it.

  # We should use -Wno-invalid-offsetof flag to disable some warnings from gcc

  # regarding offset() usage in C++ which are done in a safe manner in the

  # server

  CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"

  AC_DEFINE([HAVE_EXPLICIT_TEMPLATE_INSTANTIATION],

    [1], [Defined by configure. Use explicit template instantiation.])

mysql-test/extra/binlog_tests/binlog.test

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# misc binlogging tests that do not require a slave running

#



-- source include/not_embedded.inc

-- source include/have_bdb.inc

-- source include/have_innodb.inc

-- source include/have_debug.inc

mysql-test/extra/binlog_tests/blackhole.test

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Simple test for blackhole example

# Taken from the select test

#

-- source include/not_embedded.inc

-- source include/have_blackhole.inc



--disable_warnings

mysql-test/extra/binlog_tests/ctype_cp932.test

+0 −22
Original line number Diff line number Diff line
@@ -398,28 +398,6 @@ DROP TABLE t2; 
DROP TABLE t3;

DROP TABLE t4;



# Test prepared statement with 0x8300 sequence in parameter while

# running with cp932 client character set.

RESET MASTER;

CREATE TABLE t1(f1 blob);

PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';

SET @var1= x'8300';

# TODO: Note that this doesn't actually test the code which was added for

# bug#11338 because this syntax for prepared statements causes the PS to

# be replicated differently than if we executed the PS from C or Java.

# Using this syntax, variable names are inserted into the binlog instead

# of values. The real goal of this test is to check the code that was

# added to Item_param::query_val_str() in order to do hex encoding of

# PS parameters when the client character set is cp932;

# Bug#11338 has an example java program which can be used to verify this 

# code (and I have used it to test the fix) until there is some way to

# exercise this code from mysql-test-run.

EXECUTE stmt1 USING @var1;

SHOW BINLOG EVENTS FROM 102;

SELECT HEX(f1) FROM t1;

DROP table t1;

# end test for bug#11338



SET collation_connection='cp932_japanese_ci';

-- source include/ctype_filesort.inc

SET collation_connection='cp932_bin';