diff options
| author | jimw@mysql.com <> | 2005-08-01 17:54:57 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-08-01 17:54:57 -0700 |
| commit | 48d111c8c2169cb08ce59431118924a12a4570d8 (patch) | |
| tree | c2a4f1c838bccde279f578e1d54a016a0d377f51 /mysql-test/r/variables.result | |
| parent | 8d591d0189cde764cfa7df28040cedd94b45bce3 (diff) | |
| parent | ca56883011ffd39e2c0e25bbe024e383b54bd412 (diff) | |
| download | mariadb-git-48d111c8c2169cb08ce59431118924a12a4570d8.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 7307f911dbf..a7c96d89f0d 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -92,7 +92,7 @@ Variable_name Value max_join_size HA_POS_ERROR set @@max_join_size=1000, @@global.max_join_size=2000; select @@local.max_join_size, @@global.max_join_size; -@@session.max_join_size @@global.max_join_size +@@local.max_join_size @@global.max_join_size 1000 2000 select @@identity, length(@@version)>0; @@identity length(@@version)>0 @@ -428,23 +428,23 @@ Variable_name Value myisam_max_sort_file_size MAX_FILE_SIZE set global myisam_max_sort_file_size=default; select @@global.max_user_connections,@@local.max_join_size; -@@global.max_user_connections @@session.max_join_size +@@global.max_user_connections @@local.max_join_size 100 200 set @svc=@@global.max_user_connections, @svj=@@local.max_join_size; select @@global.max_user_connections,@@local.max_join_size; -@@global.max_user_connections @@session.max_join_size +@@global.max_user_connections @@local.max_join_size 100 200 set @@global.max_user_connections=111,@@local.max_join_size=222; select @@global.max_user_connections,@@local.max_join_size; -@@global.max_user_connections @@session.max_join_size +@@global.max_user_connections @@local.max_join_size 111 222 set @@global.max_user_connections=@@local.max_join_size,@@local.max_join_size=@@global.max_user_connections; select @@global.max_user_connections,@@local.max_join_size; -@@global.max_user_connections @@session.max_join_size +@@global.max_user_connections @@local.max_join_size 222 111 set @@global.max_user_connections=@svc, @@local.max_join_size=@svj; select @@global.max_user_connections,@@local.max_join_size; -@@global.max_user_connections @@session.max_join_size +@@global.max_user_connections @@local.max_join_size 100 200 set @a=1, @b=2; set @a=@b, @b=@a; |