diff options
| author | unknown <vtkachenko@intelp4d.mysql.com> | 2004-12-31 09:00:34 +0100 |
|---|---|---|
| committer | unknown <vtkachenko@intelp4d.mysql.com> | 2004-12-31 09:00:34 +0100 |
| commit | c4c2c7bceb3a427fe669bfeec6747a72e404e1ad (patch) | |
| tree | 2d4a9134c1f6b640fe3644c0690a6d0f81ec14f5 /mysql-test/r/variables.result | |
| parent | ee4c910422236fd376df0d9688ce0ca39f61fdfc (diff) | |
| parent | af22d870fae05614d893a0acd620e6bb369cc157 (diff) | |
| download | mariadb-git-c4c2c7bceb3a427fe669bfeec6747a72e404e1ad.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 5d34d6f6f52..56704cf4f35 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -137,6 +137,14 @@ set global concurrent_insert=DEFAULT; show variables like 'concurrent_insert'; Variable_name Value concurrent_insert ON +set global timed_mutexes=1; +show variables like 'timed_mutexes'; +Variable_name Value +timed_mutexes ON +set global timed_mutexes=0; +show variables like 'timed_mutexes'; +Variable_name Value +timed_mutexes OFF set storage_engine=MYISAM, storage_engine="HEAP", global storage_engine="INNODB"; show local variables like 'storage_engine'; Variable_name Value |