diff options
| author | unknown <jimw@mysql.com> | 2005-10-19 13:47:05 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-10-19 13:47:05 -0700 |
| commit | 3d53c870d379e86cdfe3498cde843258fad52bb5 (patch) | |
| tree | 29e3c2a30ecd5f46627b4a7cc9b9b1d97a73be7a /mysql-test/r/variables.result | |
| parent | f8bfae6b8765e1219403b6dba720d10b49f9a223 (diff) | |
| parent | c3ac502ab16db7118c4b1f2a70a300e6bd40af85 (diff) | |
| download | mariadb-git-3d53c870d379e86cdfe3498cde843258fad52bb5.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/my_manage.c:
Auto merged
mysql-test/mysql_test_run_new.c:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/r/variables.result:
Resolve conflicts
mysql-test/t/variables.test:
Resolve conflicts
sql/sql_acl.cc:
Resolve conflicts
strings/ctype-simple.c:
Resolve conflicts
strings/ctype-ucs2.c:
Resolve conflicts
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 30ebeb462df..3ecc48620b1 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -518,6 +518,14 @@ select ifnull(@@character_set_results,"really null"); ifnull(@@character_set_results,"really null") really null set names latin1; +select @@have_innodb; +@@have_innodb +# +set @test = @@query_prealloc_size; +set @@query_prealloc_size = @test; +select @@query_prealloc_size = @test; +@@query_prealloc_size = @test +1 create table t1 (a int); select a into @x from t1; Warnings: @@ -542,9 +550,6 @@ set @@max_heap_table_size= 4294967296; select @@max_heap_table_size > 0; @@max_heap_table_size > 0 1 -select @@have_innodb; -@@have_innodb -# select @@character_set_system; @@character_set_system utf8 |