bzr commit into mysql-6.0-backup branch (ingo.struewing:2786)

[Ingo Struewing]

#At file:///home2/mydev/bzrroot/mysql-6.0-bug41979-1/ based on
revid:ingo.struewing@stripped

 2786 Ingo Struewing	2009-03-06
      Post-pushbuild fix.
      Remove output differences due to machine endianess.
     @ mysql-test/suite/backup/include/backup_client_regex_output.inc
        Post-pushbuild fix.
        Remove output differences due to machine endianess.
     @ mysql-test/suite/backup/r/backup_client_binlog.result
        Post-pushbuild fix.
        Remove output differences due to machine endianess.

    modified:
      mysql-test/suite/backup/include/backup_client_regex_output.inc
      mysql-test/suite/backup/r/backup_client_binlog.result
=== modified file 'mysql-test/suite/backup/include/backup_client_regex_output.inc'
--- a/mysql-test/suite/backup/include/backup_client_regex_output.inc	2009-02-26 13:07:12
+0000
+++ b/mysql-test/suite/backup/include/backup_client_regex_output.inc	2009-03-06 11:59:50
+0000
@@ -25,6 +25,10 @@
 #        Replace everything behind "Server byte order: " until newline,
 #        but excluding newline by "#".
 #
+#      /Image options: [^[.newline.]]*/Image options: #/
+#        Replace everything behind "Image options: " until newline,
+#        but excluding newline by "#". Due to endian differences.
+#
 #      /'([[:alpha:]]:)?[\/\\][^']*'/#/
 #        Replace everything between single quotes, that starts with
 #        an optional drive letter and colon plus a slash or backslash
@@ -59,4 +63,4 @@
 # Note: --replace_regex does neither allow continuation lines,
 #                       nor variable substitution (e.g. replace_regex $EXPR).
 #
---replace_regex /Image path: [^[.newline.]]*/Image path: #/ /Image size:
[^[.newline.]]*/Image size: #/ / time: [^[.newline.]]*/ time: #/ /Server version:
[^[.newline.]]*/Server version: #/ /Server byte order: [^[.newline.]]*/Server byte order:
#/ /'([[:alpha:]]:)?[\/\\][^']*'/#/ /.*mysqlbackup(\.exe)?: Out of memory
[^[.newline.]]*/mysqlbackup: Out of memory/ /.*mysqlbackup(\.exe)?: needed .*// /STARTS
'....-..-.. ..:..:..'/STARTS 'yyyy-mm-dd HH:MM:SS'/ /non-existent (.*) position:
[0-9]*/non-existent \1 position: #/ /Binlog (coordinates|group coords):
[^[.newline.]]*/Binlog \1: #/
+--replace_regex /Image path: [^[.newline.]]*/Image path: #/ /Image size:
[^[.newline.]]*/Image size: #/ / time: [^[.newline.]]*/ time: #/ /Server version:
[^[.newline.]]*/Server version: #/ /Server byte order: [^[.newline.]]*/Server byte order:
#/ /Image options: [^[.newline.]]*/Image options: #/ /'([[:alpha:]]:)?[\/\\][^']*'/#/
/.*mysqlbackup(\.exe)?: Out of memory [^[.newline.]]*/mysqlbackup: Out of memory/
/.*mysqlbackup(\.exe)?: needed .*// /STARTS '....-..-.. ..:..:..'/STARTS 'yyyy-mm-dd
HH:MM:SS'/ /non-existent (.*) position: [0-9]*/non-existent \1 position: #/ /Binlog
(coordinates|group coords): [^[.newline.]]*/Binlog \1: #/

=== modified file 'mysql-test/suite/backup/r/backup_client_binlog.result'
--- a/mysql-test/suite/backup/r/backup_client_binlog.result	2009-02-26 13:07:12 +0000
+++ b/mysql-test/suite/backup/r/backup_client_binlog.result	2009-03-06 11:59:50 +0000
@@ -33,7 +33,7 @@ Image version:       1
 Creation time: #
 Server version: #
 Server byte order: #
-Image options:       BINLOG
+Image options: #
 Server charset:      'utf8'
 Backup image chrset: 'utf8'
 Snapshot count:      2


Attachment: [text/bzr-bundle] bzr/[e-mail]