mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
9368c7bcd8
- ie. backport from 5.1 - also update testcase error dected by new version mysql-test/include/show_msg.inc: BitKeeper file /home/msvensson/mysql/same_tools/my41-same_tools/mysql-test/include/show_msg.inc mysql-test/include/show_msg80.inc: BitKeeper file /home/msvensson/mysql/same_tools/my41-same_tools/mysql-test/include/show_msg80.inc BitKeeper/deleted/.del-rpl_chain_temp_table.test: Delete: mysql-test/t/rpl_chain_temp_table.test BitKeeper/deleted/.del-rpl_chain_temp_table.result: Delete: mysql-test/r/rpl_chain_temp_table.result BitKeeper/deleted/.del-rpl_failsafe.result: Delete: mysql-test/r/rpl_failsafe.result BitKeeper/deleted/.del-rpl_failsafe.test: Delete: mysql-test/t/rpl_failsafe.test BitKeeper/deleted/.del-rpl_heap.test: Delete: mysql-test/t/rpl_heap.test BitKeeper/deleted/.del-rpl_heap.result: Delete: mysql-test/r/rpl_heap.result BitKeeper/deleted/.del-rpl000018.result: Delete: mysql-test/r/rpl000018.result BitKeeper/deleted/.del-rpl000018.test: Delete: mysql-test/t/rpl000018.test client/Makefile.am: Link mysqltest with mysys/my_copy.c client/mysqltest.c: Update mysqltest to latest version mysql-test/include/have_multi_ndb.inc: Remove old syntax "@filename" in favor of "--require filename" mysql-test/include/master-slave.inc: Remove old syntax "@filename" in favor of "--require filename" mysql-test/include/ps_query.inc: Remove the comment about no output now when it does. mysql-test/r/check.result: Update output from --send mysql-test/r/connect.result: Update result file for connect test after backport form 5.1 mysql-test/r/flush.result: Update output from --send mysql-test/r/flush_block_commit.result: Update output from --send mysql-test/r/func_misc.result: Update output from --send mysql-test/r/grant2.result: Update output from --send mysql-test/r/handler.result: Update output from --send mysql-test/r/kill.result: Update output from --send mysql-test/r/lock_multi.result: Update output from --send mysql-test/r/mix_innodb_myisam_binlog.result: Update output from --send mysql-test/r/mysqltest.result: Update mysqltest.result after backport mysql-test/r/ps_2myisam.result: Update result as the output from query is now printed mysql-test/r/ps_3innodb.result: Update result as the output from query is now printed mysql-test/r/ps_4heap.result: Update result as the output from query is now printed mysql-test/r/ps_5merge.result: Update result as the output from query is now printed mysql-test/r/ps_6bdb.result: Update result as the output from query is now printed mysql-test/r/ps_7ndb.result: Update result as the output from query is now printed mysql-test/r/rename.result: Update output from --send mysql-test/r/rpl000001.result: Update output from --send mysql-test/r/rpl_error_ignored_table.result: Update output from --send mysql-test/r/rpl_master_pos_wait.result: Update output from --send mysql-test/r/subselect.result: Update result file after adding missing ; mysql-test/r/synchronization.result: Update output from --send mysql-test/r/type_blob.result: Update result file after adding missing ; mysql-test/t/connect.test: Backport test from 5.1 mysql-test/t/init_file.test: Update test so something is printed mysql-test/t/mysql_client_test.test: Update test so result is sent to file and something is printed mysql-test/t/mysqltest.test: Backport latest mysqltest.test file mysql-test/t/ps.test: Move the --replace_column statement to just before the statetement it should replace mysql-test/t/ps_1general.test: Move the --replace_column statement to just before the statetement it should replace mysql-test/t/ps_grant.test: Remove the $DB, no other test uses it mysql-test/t/rpl_flush_tables.test: Fetch $SERVER_VERSION from the db server mysql-test/t/rpl_trunc_temp.test: Remove the selection of connection master after it's been disconnected already mysql-test/t/subselect.test: Add missing ; mysql-test/t/type_blob.test: Add missing ;
118 lines
4.5 KiB
C++
Executable file
118 lines
4.5 KiB
C++
Executable file
#### 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:
|
|
# :
|
|
# let $message= <value>;
|
|
# --source include/show_msg80.inc
|
|
# :
|
|
#
|
|
# Attention:
|
|
# - Please do not write any spaces between $message and the "=", because the
|
|
# assignment will not work.
|
|
# - Be careful with single quotes within the value. They must be escaped like
|
|
# "''" or "\'".
|
|
# - Do not keep the value between single quotes.
|
|
#
|
|
#
|
|
# Content of "$message" and protocol output depending on the assignment:
|
|
# ----------------------------------------------------------------------
|
|
#
|
|
# I is assumed, that the value is not kept between double quotes.
|
|
#
|
|
# <x> first character after "$message=",
|
|
# where the content is not (space or tab)
|
|
# <y*> first character after beginning of the line,
|
|
# where the content is not (space or tab)
|
|
# <z> last char before ";"
|
|
# | beginning or end of line
|
|
#
|
|
# script: let $message= <x><whatever0>|
|
|
# | <y1><whatever1>|
|
|
# |................|
|
|
# | <yn><whatevern><z>;
|
|
# content: "<x><whatever0><new line><y1><whatever1><new line>
|
|
# ....<new line><yn><whatevern><z>"
|
|
# protocol output: |<x><whatever0>|
|
|
# |<y1><whatever1>|
|
|
# |.....|
|
|
# |<yn><whatevern><z>|
|
|
# |--- 80 dashes ---|
|
|
#
|
|
# Attention:
|
|
# <x> and <y*> set to characters like "-$#" which are also used
|
|
# to start comments, options and the names of mysqltest variables
|
|
# lead to syntax errors or mangled messages.
|
|
#
|
|
#
|
|
# Examples of messages:
|
|
# ---------------------
|
|
#
|
|
# Variant1 (ease of use):
|
|
# Several lines with indentation kept between double quotes
|
|
# script: |let $message=
|
|
# |" Testcase 3.1 : Ensure that Pi is not an|
|
|
# | integer number.|
|
|
# | Third line";
|
|
# protocol: |" Testcase 3.1 : Ensure that Pi is not an|
|
|
# | integer number.|
|
|
# | Third line"|
|
|
# |------ 80 dashes ----|
|
|
#
|
|
# Please mention that
|
|
# - the '"' preserves the indentation.
|
|
# - it is easy to write the script lines to get a fine indentation,
|
|
# if the value starts at the beginning of a new line
|
|
# - the '"' is printed
|
|
# - there are the least or no problems with characters like "-#$"
|
|
#
|
|
#
|
|
# Variant 2 (grep the messages from the protocol is easy):
|
|
# Several lines with indentation + auxiliary character (".")
|
|
# at the (non tab or space) beginning of every message line
|
|
# script: |let $message= . Testcase 3.1 : Ensure that Pi is not an|
|
|
# | . integer number.|
|
|
# | . Third line;
|
|
# protocol: |. Testcase 3.1 : Ensure that Pi is not an|
|
|
# |. integer number.|
|
|
# |. Third line|
|
|
# |------ 80 dashes ----|
|
|
# Please mention that
|
|
# - the auxiliary character preserves the indentation.
|
|
# - it is easy to write the script lines to get a fine indentation
|
|
# - the auxiliary character is printed
|
|
# - it is recommended to use "." as auxiliary character
|
|
# - auxiliary characters like "-'$#" cause problems
|
|
#
|
|
#
|
|
#
|
|
# Bad variant1: Several lines with lost indentation
|
|
# script: |let $message= Here is message line 1
|
|
# | message line 2;
|
|
# protocol: |Here is message line 1|
|
|
# |message line 2|
|
|
# |------ 80 dashes ----|
|
|
# Please mention, that the leading spaces of the message lines disappeared.
|
|
#
|
|
# Bad variant2: Several lines leading to a syntax error, because of "-"
|
|
# script: |let $message= - This is a message
|
|
# | - with a second and
|
|
# | - third line;
|
|
# protocol: | - third line;;
|
|
# |ERROR 42000: You have an error ... near '- third line'
|
|
# + several following errors
|
|
#
|
|
#
|
|
|
|
--disable_query_log
|
|
eval SET @utf8_message = CONVERT('$message' using utf8);
|
|
select @utf8_message as ""
|
|
union
|
|
select repeat(CONVERT('-' using utf8),80);
|
|
--enable_query_log
|