diff options
| author | unknown <jimw@mysql.com> | 2005-08-01 17:54:57 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-01 17:54:57 -0700 |
| commit | d083e4ac1b1450e99984dcf488cfd95cefaf78cb (patch) | |
| tree | c2a4f1c838bccde279f578e1d54a016a0d377f51 /mysql-test/r/variables.result | |
| parent | 8fc1e27fb7604b93358a15f26a0c849faa21a1ca (diff) | |
| parent | c679cb67bc8958a15dab68febf236ea1edeff5c5 (diff) | |
| download | mariadb-git-d083e4ac1b1450e99984dcf488cfd95cefaf78cb.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/key_cache.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/func_math.result:
Resolve conflicts
mysql-test/r/user_var.result:
Resolve conflicts
mysql-test/t/func_math.test:
Resolve conflicts
mysql-test/t/user_var.test:
Resolve conflicts
sql/item_func.cc:
Resolve conflicts
sql/sql_parse.cc:
Resolve conflicts
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; |