diff options
| author | unknown <bar@mysql.com> | 2005-09-02 12:01:19 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-09-02 12:01:19 +0500 |
| commit | c99b50f1dd57b79c9d788c1e08da26b1404492b3 (patch) | |
| tree | 2045fd482779b6e58718b8c2a6b4ca70fc4b0e81 /mysql-test | |
| parent | ee436f7c4a18e66c0195376b71289075ce88ec1e (diff) | |
| parent | 3b077226c9d2721725405410cd64868e76ba095b (diff) | |
| download | mariadb-git-c99b50f1dd57b79c9d788c1e08da26b1404492b3.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b12363
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/variables.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index efcc3d21144..67c78d82a24 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -491,6 +491,11 @@ SHOW VARIABLES LIKE 'table_cache'; Variable_name Value table_cache 1 SET GLOBAL table_cache=DEFAULT; +set character_set_results=NULL; +select ifnull(@@character_set_results,"really null"); +ifnull(@@character_set_results,"really null") +really null +set names latin1; select @@have_innodb; @@have_innodb # diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index f888541f17a..a8844070207 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -380,6 +380,14 @@ SET GLOBAL table_cache=-1; SHOW VARIABLES LIKE 'table_cache'; SET GLOBAL table_cache=DEFAULT; +# +# Bugs12363: character_set_results is nullable, +# but value_ptr returns string "NULL" +# +set character_set_results=NULL; +select ifnull(@@character_set_results,"really null"); +set names latin1; + # End of 4.1 tests # |