Commit a1650dea authored by unknown's avatar unknown

Adding auxiliary scripts that allow to display messages in result files from within test files

 - show_msg.inc   - displays a message followed by a line of '-' at the length of the messgae
 - show_msg80.inc - displays a message followed by a line of '-' with a fixed length of 80


mysql-test/r/mysqltest.result:
  Updated result file
mysql-test/t/mysqltest.test:
  Added test cases to test the show_msg.inc and show_msg80.inc auxiliary files
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent 9227cf42
...@@ -202,6 +202,7 @@ ndbdev@ndbmaster.mysql.com ...@@ -202,6 +202,7 @@ ndbdev@ndbmaster.mysql.com
ndbdev@shark. ndbdev@shark.
nick@mysql.com nick@mysql.com
nick@nick.leippe.com nick@nick.leippe.com
obarnir@mysql.com
papa@gbichot.local papa@gbichot.local
patg@krsna. patg@krsna.
patg@krsna.patg.net patg@krsna.patg.net
......
#### 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
#### include/show_msg80.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.
# This can be used in the case of long messages,
# multi line messages that exceed 80 or if an 80 char
# line is desired for short 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
...@@ -148,3 +148,17 @@ a'b a"b ...@@ -148,3 +148,17 @@ a'b a"b
select 'aaa\\','aa''a',"aa""a"; select 'aaa\\','aa''a',"aa""a";
aaa\ aa'a aa"a 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 @message = USER();
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
--------------------------------------------------------------------------------
...@@ -295,3 +295,23 @@ select 1 as `a'b`, 2 as `a"b`; ...@@ -295,3 +295,23 @@ select 1 as `a'b`, 2 as `a"b`;
# Test escaping of quotes # Test escaping of quotes
select 'aaa\\','aa''a',"aa""a"; 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 @message = USER();
--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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment