Commit f7cf76fc authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/my/mysql-5.0 

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


BitKeeper/deleted/.del-innodb_notembedded.test:
  Delete: mysql-test/t/innodb_notembedded.test
BitKeeper/deleted/.del-sp_notembedded.test:
  Delete: mysql-test/t/sp_notembedded.test
BitKeeper/deleted/.del-subselect_notembedded.test:
  Delete: mysql-test/t/subselect_notembedded.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.result:
  Delete: mysql-test/r/ctype_cp932_notembedded.result
BitKeeper/deleted/.del-innodb_notembedded.result:
  Delete: mysql-test/r/innodb_notembedded.result
BitKeeper/deleted/.del-sp_notembedded.result:
  Delete: mysql-test/r/sp_notembedded.result
BitKeeper/deleted/.del-subselect_notembedded.result:
  Delete: mysql-test/r/subselect_notembedded.result
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/emb_qcache.cc:
  Auto merged
libmysqld/embedded_priv.h:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/query_cache_notembedded.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/compress.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/read_only.test:
  Auto merged
mysql-test/t/skip_grants.test:
  Auto merged
mysql-test/t/sp-destruct.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp-threads.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/temp_table.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged
mysys/mf_dirname.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_cursor.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/tztime.h:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
libmysqld/lib_sql.cc:
  Manual merge
mysql-test/extra/binlog_tests/binlog.test:
  Manual merge
mysql-test/extra/binlog_tests/ctype_cp932.test:
  No changes
mysql-test/r/binlog_stm_binlog.result:
  Manual merge
mysql-test/r/binlog_stm_ctype_cp932.result:
  No changes
mysql-test/t/innodb.test:
  Manual merge
mysql-test/t/view.test:
  Manual merge
mysys/my_bitmap.c:
  Manual merge
scripts/mysql_fix_privilege_tables.sql:
  Manual merge
sql/item.cc:
  Manual merge
sql/sql_cache.h:
  Manual merge
sql/sql_class.h:
  Manual merge
sql/sql_update.cc:
  Manual merge
parents e737b001 f5f01b15

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';

mysql-test/r/binlog_stm_ctype_cp932.result

+0 −14
Original line number Diff line number Diff line
@@ -11315,20 +11315,6 @@ DROP TABLE t1; 
DROP TABLE t2;

DROP TABLE t3;

DROP TABLE t4;

RESET MASTER;

CREATE TABLE t1(f1 blob);

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

SET @var1= x'8300';

EXECUTE stmt1 USING @var1;

SHOW BINLOG EVENTS FROM 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	102	Query	1	189	use `test`; CREATE TABLE t1(f1 blob)

master-bin.000001	189	User var	1	228	@`var1`=_binary 0x8300 COLLATE binary

master-bin.000001	228	Query	1	321	use `test`; INSERT INTO t1 VALUES(@'var1')

SELECT HEX(f1) FROM t1;

HEX(f1)

8300

DROP table t1;

SET collation_connection='cp932_japanese_ci';

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

delete from t1;