diff options
| author | unknown <serg@serg.mylan> | 2004-11-17 18:04:36 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-17 18:04:36 +0100 |
| commit | 4f6413094c069cb78aee0c9b1b7d77b34eb3ae5d (patch) | |
| tree | 35f1caf73d4e61d1cb7338841a38299682005317 /mysql-test/r/user_var.result | |
| parent | 7f5be1b65460bea40661bbeefe209831b528c67d (diff) | |
| parent | 6ce9ed784e5507073a33b8c4771fba16f29f840f (diff) | |
| download | mariadb-git-4f6413094c069cb78aee0c9b1b7d77b34eb3ae5d.tar.gz | |
merged
client/Makefile.am:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'mysql-test/r/user_var.result')
| -rw-r--r-- | mysql-test/r/user_var.result | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index 36705c33b5d..800c77ec83b 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -195,12 +195,7 @@ INSERT INTO t1 VALUES(@`a b`); SET @`var1`:=_latin1 0x273B616161 COLLATE latin1_swedish_ci; SET TIMESTAMP=10000; insert into t1 values (@var1); -SET TIMESTAMP=10000; -create table t2 (c char(30)) charset=ucs2; -SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci; -SET TIMESTAMP=10000; -insert into t2 values (@v); -drop table t1, t2; +drop table t1; set @var= NULL ; select FIELD( @var,'1it','Hit') as my_column; my_column |