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/func_system.result | |
| 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/func_system.result')
| -rw-r--r-- | mysql-test/r/func_system.result | 4 |
1 files changed, 2 insertions, 2 deletions
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')); |