diff options
| author | unknown <ramil@mysql.com> | 2005-08-31 10:25:00 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-08-31 10:25:00 +0500 |
| commit | c00dd12c284bdd14d6aa469b0f5aab4e0205f486 (patch) | |
| tree | 362fedc1c7bc244cd193620869e0a203d37434e8 /mysql-test/r/variables.result | |
| parent | 44327dc4685f5c1c15d5553f975b53ea52be89df (diff) | |
| parent | 2599491a6784458c54c561f9629ec45112767773 (diff) | |
| download | mariadb-git-c00dd12c284bdd14d6aa469b0f5aab4e0205f486.tar.gz | |
Merge mysql.com:/usr/home/ram/work/4.1.b9613
into mysql.com:/usr/home/ram/work/mysql-5.0
sql/ha_blackhole.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/r/variables.result:
merging
mysql-test/t/variables.test:
merging
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index a7c96d89f0d..4983e0ae3e8 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -537,3 +537,6 @@ set @@max_heap_table_size= 4294967296; select @@max_heap_table_size > 0; @@max_heap_table_size > 0 1 +select @@have_innodb; +@@have_innodb +# |