bk commit into 5.1 tree (lars:1.2316)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-15 03:15:06+02:00, lars@stripped +1 -0
  Merge main->rpl

  mysql-test/r/variables.result@stripped, 2006-09-15 03:15:02+02:00, lars@stripped +6 -0
    Merge main->rpl

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/MERGE/mysql-5.1-merge

--- 1.92/mysql-test/r/variables.result	2006-09-15 03:15:19 +02:00
+++ 1.93/mysql-test/r/variables.result	2006-09-15 03:15:19 +02:00
@@ -840,6 +840,12 @@ log_queries_not_using_indexes	OFF
 select * from information_schema.session_variables where variable_name like 'log_queries_not_using_indexes';
 VARIABLE_NAME	VARIABLE_VALUE
 LOG_QUERIES_NOT_USING_INDEXES	OFF
+select @@"";
+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 '""' at line 1
+select @@&;
+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 '&' at line 1
+select @@@;
+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 '@' at line 1
 End of 5.0 tests
 set global binlog_cache_size         =@my_binlog_cache_size;
 set global connect_timeout           =@my_connect_timeout;