bk commit into 5.0 tree (obarnir:1.1939)

[obarnir]

Below is the list of changes that have just been committed into a local
5.0 repository of omer. When omer 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.1939 05/06/07 17:29:14 obarnir@stripped +5 -0
  Adding auxiliary scripts to allow adding comments to result files from within test files
  show_msg.inc   - adds a message with a '-' variable length line
  show_msg80.inc - same as above with a fixed '-' line set to 80 to allow for long 
                   multi line comments

  BitKeeper/etc/logging_ok
    1.322 05/06/07 17:29:13 obarnir@stripped +1 -0
    Logging to logging@stripped accepted

  mysql-test/include/show_msg80.inc
    1.1 05/06/07 17:28:44 obarnir@stripped +21 -0

  mysql-test/include/show_msg80.inc
    1.0 05/06/07 17:28:44 obarnir@stripped +0 -0
    BitKeeper file /home/omer/source/src50_0607/mysql-test/include/show_msg80.inc

  mysql-test/include/show_msg.inc
    1.1 05/06/07 17:28:43 obarnir@stripped +19 -0

  mysql-test/t/mysqltest.test
    1.5 05/06/07 17:28:43 obarnir@stripped +22 -0
    Added tests for testing the show_msg.inc and show_msg80.inc files

  mysql-test/r/mysqltest.result
    1.5 05/06/07 17:28:43 obarnir@stripped +15 -0
    Updated result file

  mysql-test/include/show_msg.inc
    1.0 05/06/07 17:28:43 obarnir@stripped +0 -0
    BitKeeper file /home/omer/source/src50_0607/mysql-test/include/show_msg.inc

# 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:	obarnir
# Host:	linux.site
# Root:	/home/omer/source/src50_0607

--- 1.321/BitKeeper/etc/logging_ok	2005-06-06 11:20:47 -07:00
+++ 1.322/BitKeeper/etc/logging_ok	2005-06-07 17:29:13 -07:00
@@ -201,6 +201,7 @@
 ndbdev@shark.
 nick@stripped
 nick@stripped
+obarnir@stripped
 papa@stripped
 patg@krsna.
 patg@stripped

--- 1.4/mysql-test/r/mysqltest.result	2005-05-06 04:44:41 -07:00
+++ 1.5/mysql-test/r/mysqltest.result	2005-06-07 17:28:43 -07:00
@@ -148,3 +148,18 @@
 select 'aaa\\','aa''a',"aa""a";
 aaa\	aa'a	aa"a
 aaa\	aa'a	aa"a
+SET @message = 'Here comes a message';
+
+Here comes a message
+--------------------
+SET @who_am_i= USER();
+SET @message = @who_am_i;
+
+root@localhost
+--------------
+SET @message = 'Here comes a very very long message that is longer then 80 characters
+on multiple lines';
+
+Here comes a very very long message that is longer then 80 characters
+on multiple lines
+--------------------------------------------------------------------------------

--- 1.4/mysql-test/t/mysqltest.test	2005-05-06 04:44:14 -07:00
+++ 1.5/mysql-test/t/mysqltest.test	2005-06-07 17:28:43 -07:00
@@ -295,3 +295,25 @@
 
 # Test escaping of quotes
 select 'aaa\\','aa''a',"aa""a";
+
+
+
+#
+# Check of include/show_msg.inc
+#
+
+# The message contains in most cases a string with the default character set
+SET @message = 'Here comes a message';
+--source include/show_msg.inc
+
+# The message could also contain a string with character set utf8
+SET @who_am_i= USER();
+
+SET @message = @who_am_i;
+--source include/show_msg.inc
+
+# The message contains more then 80 characters on multiple lines
+SET @message = 'Here comes a very very long message that is longer then 80 characters
+on multiple lines';
+--source include/show_msg80.inc
+
--- New file ---
+++ mysql-test/include/show_msg.inc	05/06/07 17:28:43
#### include/show_msg.inc
#
# This file writes the value set in @message into the
# a protocol file as part of executing a test sequence
#
# Usage:
#    Add the following to any *.test file:
#      :
#    set @message="This is a message example";
#    --source include/show_msg.inc
#      :
#

--disable_query_log
SET @utf8_message = CONVERT(@message using utf8);
select @utf8_message as ""
union
select repeat(CONVERT('-' using utf8),char_length(@utf8_message));
--enable_query_log

--- New file ---
+++ mysql-test/include/show_msg80.inc	05/06/07 17:28:44
#### include/show_msg.inc
#
# This file writes the value set in @message into the
# a protocol file as part of executing a test sequence
# with a dash line that is fixed on 80 characters so it
# can be supported with multi line long messages
#
# Usage:
#    Add the following to any *.test file:
#      :
#    set @message="This is a message example";
#    --source include/show_msg80.inc
#      :
#

--disable_query_log
SET @utf8_message = CONVERT(@message using utf8);
select @utf8_message as ""
union
select repeat(CONVERT('-' using utf8),80);
--enable_query_log