database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/my/mysql-5.1
This commit is contained in:
monty@mysql.com
2006-02-25 21:54:34 +02:00
parent 066c7148fb 54274976e7
commit 1e2e9e2856
45 changed files with 10745 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/extra/binlog_tests/binlog.test
View File

@@ -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

1
mysql-test/extra/binlog_tests/blackhole.test
View File

@@ -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

22
mysql-test/extra/binlog_tests/ctype_cp932.test
View File

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