bk commit into 5.1 tree (andrey:1.2213)

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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
  1.2213 06/03/02 23:40:51 andrey@lmy004. +2 -0
  update test

  mysql-test/t/events_logs_tests.test
    1.5 06/03/02 23:40:42 andrey@lmy004. +15 -5
    update test

  mysql-test/r/events_logs_tests.result
    1.5 06/03/02 23:40:42 andrey@lmy004. +16 -11
    update result

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-bug17494

--- 1.4/mysql-test/r/events_logs_tests.result	2006-03-01 16:27:47 +01:00
+++ 1.5/mysql-test/r/events_logs_tests.result	2006-03-02 23:40:42 +01:00
@@ -1,21 +1,26 @@
 create database if not exists events_test;
 use events_test;
+"We use procedure here because its statements won't be logged into the general log"
+"If we had used normal select that are logged in different ways depending on whether"
+"the test suite is run in normal mode or with --ps-protocol"
+CREATE procedure select_general_log()
+BEGIN
+SELECT user_host, argument FROM mysql.general_log WHERE argument LIKE '%alabala%';
+END|
 "Check General Query Log"
 SET GLOBAL event_scheduler=0;
-create event log_general on schedule every 1 minute do seLect 'alabala', sleep(3) from
dual;
+create event log_general on schedule every 1 minute do SELect 'alabala', sleep(3) from
dual;
 TRUNCATE mysql.general_log;
-SELECT user_host, command_type, argument FROM mysql.general_log;
-user_host	command_type	argument
-root[root] @ localhost []	Query	SELECT user_host, command_type, argument FROM
mysql.general_log
+"1 row, the current statement!"
+call select_general_log();
+user_host	argument
 SET GLOBAL event_scheduler=1;
 "Wait the scheduler to start"
-"Should see 3 rows. The create, the seLect and the select from the general_log"
-SELECT user_host, command_type, argument FROM mysql.general_log;
-user_host	command_type	argument
-root[root] @ localhost []	Query	SELECT user_host, command_type, argument FROM
mysql.general_log
-root[root] @ localhost []	Query	SET GLOBAL event_scheduler=1
-root[root] @ localhost [localhost]	Query	seLect 'alabala', sleep(3) from dual
-root[root] @ localhost []	Query	SELECT user_host, command_type, argument FROM
mysql.general_log
+"Should see 3 rows - the 'SELect' is in the middle. The other two are selects from
general_log"
+call select_general_log();
+user_host	argument
+root[root] @ localhost [localhost]	SELect 'alabala', sleep(3) from dual
+DROP PROCEDURE select_general_log;
 DROP EVENT log_general;
 SET GLOBAL event_scheduler=0;
 "Check slow query log"

--- 1.4/mysql-test/t/events_logs_tests.test	2006-03-01 16:27:47 +01:00
+++ 1.5/mysql-test/t/events_logs_tests.test	2006-03-02 23:40:42 +01:00
@@ -1,16 +1,26 @@
 create database if not exists events_test;
 use events_test;
-
+--echo "We use procedure here because its statements won't be logged into the general
log"
+--echo "If we had used normal select that are logged in different ways depending on
whether"
+--echo "the test suite is run in normal mode or with --ps-protocol"
+delimiter |;
+CREATE procedure select_general_log()
+BEGIN
+  SELECT user_host, argument FROM mysql.general_log WHERE argument LIKE '%alabala%';
+END|
+delimiter ;|
 --echo "Check General Query Log"
 SET GLOBAL event_scheduler=0;
-create event log_general on schedule every 1 minute do seLect 'alabala', sleep(3) from
dual;
+create event log_general on schedule every 1 minute do SELect 'alabala', sleep(3) from
dual;
 TRUNCATE mysql.general_log;
-SELECT user_host, command_type, argument FROM mysql.general_log;
+--echo "1 row, the current statement!"
+call select_general_log();
 SET GLOBAL event_scheduler=1;
 --echo "Wait the scheduler to start"
---echo "Should see 3 rows. The create, the seLect and the select from the general_log"
+--echo "Should see 3 rows - the 'SELect' is in the middle. The other two are selects from
general_log"
 --sleep 2
-SELECT user_host, command_type, argument FROM mysql.general_log;
+call select_general_log();
+DROP PROCEDURE select_general_log;
 DROP EVENT log_general;
 SET GLOBAL event_scheduler=0;
 --sleep 1