Commit d25c405d authored by unknown's avatar unknown
Browse files

After merge fixes 


BitKeeper/etc/ignore:
  added storage/ndb/src/common/util/testBitmask.cpp
mysql-test/mysql-test-run.sh:
  Add libmysql_r/.libs to path for shared libraries.
  (Needed for mysqlimport)
mysql-test/r/ctype_cp932_notembedded.result:
  After merge fix
mysql-test/r/func_system.result:
  Version number on embedded server can be longer than 40
mysql-test/r/partition_mgm_err.result:
  Move tests that require symlinks to partion_mgm_err2.test
mysql-test/r/query_cache.result:
  Fix possible errors from previous tests
mysql-test/t/ctype_cp932_notembedded.test:
  After merge fix
mysql-test/t/func_system.test:
  Version number on embedded server can be longer than 40
mysql-test/t/partition_mgm_err.test:
  Move tests that require symlinks to partion_mgm_err2.test
mysql-test/t/query_cache.test:
  Fix possible errors from previous tests
mysys/my_symlink2.c:
  More debugging
sql/event.cc:
  Code cleanup
sql/event_executor.cc:
  Ensure that event mutexes are properly cleared up
sql/mysqld.cc:
  Ensure that event mutexes are properly cleared up
mysql-test/r/partition_mgm_err2.result:
  New BitKeeper file ``mysql-test/r/partition_mgm_err2.result''
mysql-test/t/partition_mgm_err2.test:
  New BitKeeper file ``mysql-test/t/partition_mgm_err2.test''
parent f7cf76fc

.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

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ MY_LOG_DIR="$MYSQL_TEST_DIR/var/log" 
#

# Set LD_LIBRARY_PATH if we are using shared libraries

#

LD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/zlib/.libs:$LD_LIBRARY_PATH"

DYLD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/zlib/.libs:$DYLD_LIBRARY_PATH"

LD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/libmysql_r/.libs:$BASEDIR/zlib/.libs:$LD_LIBRARY_PATH"

DYLD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/libmysql_r/.libs:$BASEDIR/zlib/.libs:$DYLD_LIBRARY_PATH"

export LD_LIBRARY_PATH DYLD_LIBRARY_PATH



#

mysql-test/r/ctype_cp932_notembedded.result

+4 −4
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ CREATE TABLE t1(f1 blob); 
PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';

SET @var1= x'8300';

EXECUTE stmt1 USING @var1;

SHOW BINLOG EVENTS FROM 98;

SHOW BINLOG EVENTS FROM 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

mysql-test/r/func_system.result

+2 −2
Original line number Diff line number Diff line
@@ -42,13 +42,13 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

Warnings:

Note	1003	select sql_no_cache database() AS `database()`,user() AS `user()`

create table t1 (version char(40)) select database(), user(), version() as 'version';

create table t1 (version char(60)) select database(), user(), version() as 'version';

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `database()` varchar(34) character set utf8 default NULL,

  `user()` varchar(77) character set utf8 NOT NULL default '',

  `version` char(40) default NULL

  `version` char(60) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

select charset(charset(_utf8'a')), charset(collation(_utf8'a'));

mysql-test/r/partition_mgm_err.result

+0 −2
Original line number Diff line number Diff line
@@ -112,8 +112,6 @@ ALTER TABLE t1 DROP PARTITION x1; 
ALTER TABLE t1 DROP PARTITION x0;

ERROR HY000: Cannot remove all partitions, use DROP TABLE instead

DROP TABLE t1;

INSERT INTO t1 VALUES (15);

DROP TABLE t1;

CREATE TABLE t1 ( id INT NOT NULL,

fname VARCHAR(50) NOT NULL,

lname VARCHAR(50) NOT NULL,