From: Date: July 3 2009 3:00pm Subject: bzr push into mysql-6.0-backup branch (ingo.struewing:2838 to 2839) WL#4771 List-Archive: http://lists.mysql.com/commits/77901 Message-Id: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_Xd9I8WPfXqI7Y57+M2P47w)" --Boundary_(ID_Xd9I8WPfXqI7Y57+M2P47w) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline 2839 Ingo Struewing 2009-07-03 WL#4771 - Online Backup: Test cross-platform compatibility Added suite/backup/std_data to mysql-test/Makefile.am It contains the new backup file images required for the cross-platform compatibility tests. @ mysql-test/Makefile.am WL#4771 - Online Backup: Test cross-platform compatibility Added suite/backup/std_data modified: mysql-test/Makefile.am 2838 Ingo Struewing 2009-07-02 [merge] auto-merge added: mysql-test/include/not_falcon.inc mysql-test/suite/backup/include/backup_check_privileges.inc mysql-test/suite/backup/r/backup_bml_not_falcon.result mysql-test/suite/backup/r/backup_client_falcon.result mysql-test/suite/backup/r/backup_commit_restore_falcon.result mysql-test/suite/backup/r/backup_external_non_win_not_falcon.result mysql-test/suite/backup/r/backup_falcon_debug.result mysql-test/suite/backup/t/backup_bml_not_falcon.test mysql-test/suite/backup/t/backup_client_falcon.test mysql-test/suite/backup/t/backup_commit_restore_falcon.test mysql-test/suite/backup/t/backup_external_non_win_not_falcon.test mysql-test/suite/backup/t/backup_falcon_debug.test unittest/backup/ unittest/backup/Makefile.am unittest/backup/bstr_callback_errors-t.c unittest/backup/bstr_data_chunks-t.c unittest/backup/bstr_eos-t.c unittest/backup/bstr_extra-t.c unittest/backup/bstr_extra1-t.c unittest/backup/bstr_io_errors-t.c unittest/backup/bstr_random_chunks-t.c unittest/backup/catalog.c unittest/backup/catalog.h unittest/backup/no_catalog.c unittest/backup/stream_test.h unittest/backup/test_main.c unittest/backup/test_stream.c modified: Makefile.am configure.in mysql-test/collections/default.experimental mysql-test/collections/mysql-6.0-backup.push mysql-test/lib/mtr_cases.pm mysql-test/r/events_grant.result mysql-test/r/grant.result mysql-test/r/information_schema.result mysql-test/r/lowercase_table_grant.result mysql-test/r/ps.result mysql-test/r/system_mysql_db.result mysql-test/suite/backup/r/backup_check_i_s.result mysql-test/suite/backup/r/backup_client.result mysql-test/suite/backup/r/backup_commit_restore.result mysql-test/suite/backup/r/backup_db_grants.result mysql-test/suite/backup/r/backup_default_debug.result mysql-test/suite/backup/r/backup_security.result mysql-test/suite/backup/t/backup_bml.test mysql-test/suite/backup/t/backup_check_i_s.test mysql-test/suite/backup/t/backup_client.test mysql-test/suite/backup/t/backup_commit_restore.test mysql-test/suite/backup/t/backup_default_debug.test mysql-test/suite/backup/t/backup_security.test mysql-test/suite/funcs_1/r/innodb_trig_03.result mysql-test/suite/funcs_1/r/innodb_trig_03e.result mysql-test/suite/funcs_1/r/is_column_privileges.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_schema_privileges.result mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result mysql-test/suite/funcs_1/r/is_user_privileges.result mysql-test/suite/funcs_1/r/memory_trig_03.result mysql-test/suite/funcs_1/r/memory_trig_03e.result mysql-test/suite/funcs_1/r/myisam_trig_03.result mysql-test/suite/funcs_1/r/myisam_trig_03e.result mysql-test/suite/funcs_1/r/ndb_trig_03.result mysql-test/suite/funcs_1/r/ndb_trig_03e.result mysql-test/t/disabled.def scripts/mysql_system_tables.sql scripts/mysql_system_tables_data.sql scripts/mysql_system_tables_fix.sql sql/backup/backup_info.cc sql/backup/kernel.cc sql/backup/restore_info.h sql/backup/stream_v1.c sql/backup/stream_v1_transport.c sql/share/errmsg.txt sql/sql_acl.cc sql/sql_acl.h sql/sql_show.cc sql/sql_yacc.yy unittest/Makefile.am unittest/README.txt === modified file 'mysql-test/Makefile.am' --- a/mysql-test/Makefile.am 2009-06-17 07:10:40 +0000 +++ b/mysql-test/Makefile.am 2009-07-03 10:52:50 +0000 @@ -84,6 +84,7 @@ TEST_DIRS = t r include std_data std_dat std_data/funcs_1 \ extra/binlog_tests/ extra/rpl_tests \ suite/backup suite/backup/t suite/backup/r suite/backup/include \ + suite/backup/std_data \ suite/backup_engines suite/backup_engines/t suite/backup_engines/r \ suite/backup_engines/include \ suite/backup_ptr suite/backup_ptr/t suite/backup_ptr/r \ --Boundary_(ID_Xd9I8WPfXqI7Y57+M2P47w) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/ingo.struewing@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/ingo.struewing@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ingo.struewing@stripped # target_branch: file:///home2/mydev/bzrroot/mysql-6.0-wl4771-3/ # testament_sha1: 26d394aa8d4fb3e99deabaa80241d5ab313ad49e # timestamp: 2009-07-03 15:00:45 +0200 # source_branch: file:///home2/mydev/bzrroot/mysql-6.0-backup/ # base_revision_id: ingo.struewing@stripped\ # 8iscrkt20e8g5dtt # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWonv0UAAbJfgEAwWWP//3Im jIS////wUARG17Cs3TljdKThJKBT0YmiZgmU9GkNMmg0NPUNNACShMjKYJk0yp4nkJojRkAABtQS IhU09DSnlPNSZkh6mTwpp6gADJoHNMTAAmACYAATAAEwSSTQmmTJpPUaeRpGMkyAAA0Gkbskc2TO a7+G8n3RcyiGBxv0qn5nr4A8mCWyB2GxpI1Qb5mGb29VyegGhuZwklNJR0lH5JMpFxqw38cw665G z493z4P9M5i0FawX7cndGrb5JtTX0uOQo6dHloC+ZdwOTJxWTIXFU2Trbbi1Y/qW1UFI3NpQLekP vEWlA9V6o94sNiuxCfmFx0U21wbBrDSSIlUULFAprgxQrY8ZBDOVKBPESke8TjArnlwmnCUYvdhb 0itsOsJq10u7ab7/nW8a4cXjcGd+Ci2UTkZMYEZ1s2iWxSXYrhcnQpFBWxeFhWKCjS9oo51LU9vW h2OMRx6Cga6v3nPdI9m8vyNhomk3VecDKw1FaWflZrFgpnHqkZ9F5q014m+ldEyOs3TVyNL7omhQ olJ7e7ROaNBDGnSX+OgxKYrJXVsu3OOJTH1qi1clJEJ7iAnGbovyDcWnPoKdcFVlWIkGGo4EikzI T62MxoiOgxwptaFQLbztWa+BfBrJSpdHFkPTwaPR9jlrm0S7OaHr2NBlKNjb2H5iz8THLqjdoi9c +VZ4FF/Y/GwbSAKxaywsL9utZpA1EhRpLcaYN2mneQJovHcidNBDNdjFhVKzJ0Mj62Epn6FrJzIs GiGq4HDNSthlLzjccIpt26qBhNmSKkWpijqVAT4B+okmURZCqR8ItC4LIfZoMIwTVmJd6qXnyzlI 5kp01o7ibXUeXcrezV2p5NsI0qYKg6aUheSqyL1O4qNwnYJgo67OGIrYrYNrXUnTWTyAvw4pDRPU JYhemnLxszjzKOvC4tKj01yyC1zPK6h2RMn30kLJMIoAbQyRytMt0TVg0LpFUqJcafrZNJN1pRPm khpQqlO+NcGIko80j4rym0cTTfVuCOkDVarAHFqxp9mE8uFJ4XLEKsLU+KwvT9ESek2L00oW2AUC 1DywZe0XfVhZC1M8WJgj5S5J6eHHTOBhEgxQOnBy25vpvlBqQwKrXdUVKQhT4wI5v6b57sTUNH0F Cp18YgRhikZsDJTjGC9bnpT0AwXFqcqbwkixplebt2ITLRhEVCpjRQmEtbA5YXZanKtocMOcBXVd 7a2KbrdCuFhOgVFUqwqkQo1Z1SQY3CyrNRnOSAzQUFoL4+BayjniFapQQTwnEOu/zPNIft53FlDV 5LldOYeA1NgG1RHshoVptANLmrkOUQkHWEiCjXsWRSNkNI6Krt74SM4niFuWxQs3y1AaU9wvio4X wkYT2SLsXKFRdRpabHvyr69dgeOdj7C7BHLZ/i7kinChINRPfoo= --Boundary_(ID_Xd9I8WPfXqI7Y57+M2P47w)--