diff options
author | unknown <monty@mysql.com> | 2006-02-26 15:11:56 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2006-02-26 15:11:56 +0200 |
commit | d25c405dc7a6d333a377b6803c18837e885303a9 (patch) | |
tree | 493d3d9cb6f32fcc6ad0bf804993fd9c3481cd6a /mysql-test/r | |
parent | f7cf76fc80dd413c4d3adf09cba9ef223ffb1307 (diff) | |
download | mariadb-git-d25c405dc7a6d333a377b6803c18837e885303a9.tar.gz |
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''
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/ctype_cp932_notembedded.result | 8 | ||||
-rw-r--r-- | mysql-test/r/func_system.result | 4 | ||||
-rw-r--r-- | mysql-test/r/partition_mgm_err.result | 2 | ||||
-rw-r--r-- | mysql-test/r/partition_mgm_err2.result | 2 | ||||
-rw-r--r-- | mysql-test/r/query_cache.result | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/ctype_cp932_notembedded.result b/mysql-test/r/ctype_cp932_notembedded.result index d04fce7738c..7ad8545299f 100644 --- a/mysql-test/r/ctype_cp932_notembedded.result +++ b/mysql-test/r/ctype_cp932_notembedded.result @@ -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 diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result index 1c1c6dff21e..4b6563eb97c 100644 --- a/mysql-test/r/func_system.result +++ b/mysql-test/r/func_system.result @@ -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')); diff --git a/mysql-test/r/partition_mgm_err.result b/mysql-test/r/partition_mgm_err.result index 1b73bfb9f16..32b28ae15c6 100644 --- a/mysql-test/r/partition_mgm_err.result +++ b/mysql-test/r/partition_mgm_err.result @@ -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, diff --git a/mysql-test/r/partition_mgm_err2.result b/mysql-test/r/partition_mgm_err2.result new file mode 100644 index 00000000000..7e5763b8f1b --- /dev/null +++ b/mysql-test/r/partition_mgm_err2.result @@ -0,0 +1,2 @@ +INSERT INTO t1 VALUES (15); +DROP TABLE t1; diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 942eca42c93..40aa88439b9 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -3,7 +3,7 @@ flush query cache; flush query cache; reset query cache; flush status; -drop table if exists t1,t2,t3,t4,t11,t21; +drop table if exists t1,t2,t3,t4,t11,t21,t1_1,t1_2,t9,t9_1,t9_2; drop database if exists mysqltest; drop table if exists ```a`; drop view if exists v1; |