Commit 34ffbfeb authored by unknown's avatar unknown
Browse files

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
parents 4f2fe287 8a4c773a

BUILD/compile-pentium64-debug-max

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium64_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 $max_configs"



extra_configs="$extra_configs "



. "$path/FINISH.sh"

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ test: 


test-force:

	cd mysql-test; \

	./mysql-test-run --force ; \

	./mysql-test-run --force && \

	./mysql-test-run --ps-protocol --force



# We are testing a new Perl version of the test script
@@ -123,7 +123,7 @@ test-pl: 


test-force-pl:

	cd mysql-test; \

	./mysql-test-run.pl --force ; \

	./mysql-test-run.pl --force && \

	./mysql-test-run.pl --ps-protocol --force



# Don't update the files from bitkeeper

mysql-test/mysql-test-run.sh

+3 −3
Original line number Diff line number Diff line
@@ -223,10 +223,10 @@ MYSQL_MANAGER_USER=root 
# number is to be used, 0 - 16 or similar.

#

if [ -n "$MTR_BUILD_THREAD" ] ; then

  MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 40 + 8120`

  MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 5 + 10000`

  MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`

  SLAVE_MYPORT=`expr $MASTER_MYPORT + 16`

  NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 24`

  SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`

  NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 4`



  echo "Using MTR_BUILD_THREAD   = $MTR_BUILD_THREAD"

  echo "Using MASTER_MYPORT      = $MASTER_MYPORT"

mysql-test/r/ctype_cp932_binlog.result

0 → 100644
+19 −0
Original line number Diff line number Diff line 
drop table if exists t1;

set names cp932;

set character_set_database = cp932;

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

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8

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

master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8

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

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

SELECT HEX(f1) FROM t1;

HEX(f1)

8300

DROP table t1;

mysql-test/t/ctype_cp932_binlog.test

0 → 100644
+35 −0
Original line number Diff line number Diff line 
-- source include/not_embedded.inc

-- source include/have_cp932.inc



--character_set cp932

--disable_warnings

drop table if exists t1;

--enable_warnings



set names cp932;

set character_set_database = cp932;



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

--replace_column 2 # 5 #

SHOW BINLOG EVENTS FROM 79;

SELECT HEX(f1) FROM t1;

DROP table t1;

# end test for bug#11338



# End of 4.1 tests