diff options
| author | jimw@mysql.com <> | 2005-08-01 19:21:56 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-08-01 19:21:56 -0700 |
| commit | fb903c1e2c9026eb58dc1725014f07ca2475cfd4 (patch) | |
| tree | 940245c3dc8027eabe2f732e911372b489f9b031 /mysql-test/r/user_var.result | |
| parent | 48d111c8c2169cb08ce59431118924a12a4570d8 (diff) | |
| download | mariadb-git-fb903c1e2c9026eb58dc1725014f07ca2475cfd4.tar.gz | |
Fix two test results that were merged out-of-order.
Diffstat (limited to 'mysql-test/r/user_var.result')
| -rw-r--r-- | mysql-test/r/user_var.result | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index 893e024719b..acdc793fb69 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -183,6 +183,30 @@ set session @honk=99; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@honk=99' at line 1 set one_shot @honk=99; ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server +select @@local.max_allowed_packet; +@@local.max_allowed_packet +# +select @@session.max_allowed_packet; +@@session.max_allowed_packet +# +select @@global.max_allowed_packet; +@@global.max_allowed_packet +# +select @@max_allowed_packet; +@@max_allowed_packet +# +select @@Max_Allowed_Packet; +@@Max_Allowed_Packet +# +select @@version; +@@version +# +select @@global.version; +@@global.version +# +select @@session.VERSION; +@@session.VERSION +# set @first_var= NULL; create table t1 select @first_var; show create table t1; @@ -224,27 +248,3 @@ t1 CREATE TABLE `t1` ( `@first_var` longtext ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; -select @@local.max_allowed_packet; -@@local.max_allowed_packet -# -select @@session.max_allowed_packet; -@@session.max_allowed_packet -# -select @@global.max_allowed_packet; -@@global.max_allowed_packet -# -select @@max_allowed_packet; -@@max_allowed_packet -# -select @@Max_Allowed_Packet; -@@Max_Allowed_Packet -# -select @@version; -@@version -# -select @@global.version; -@@global.version -# -select @@session.VERSION; -@@session.VERSION -# |