bzr push into mysql-5.5-trunk branch (alik:2903 to 2905)

[Alexander Nozdrin]

 2905 Alexander Nozdrin	2009-10-31
      Fix default.conf.

    modified:
      .bzr-mysql/default.conf
 2904 Alexander Nozdrin	2009-10-27
      Make rpl_timezone experimental due to Bug#47017.

    modified:
      mysql-test/collections/default.experimental
 2903 Alexander Nozdrin	2009-10-23 [merge]
      Automerge from mysql-trunk.

    added:
      mysql-test/include/not_windows_embedded.inc
    modified:
      client/mysqltest.cc
      mysql-test/include/check-warnings.test
      mysql-test/include/mtr_warnings.sql
      mysql-test/lib/My/SafeProcess/safe_kill_win.cc
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/mtr_report.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/mysqltest.result
      mysql-test/t/mysqltest.test
      mysql-test/t/plugin.test
      mysql-test/t/plugin_load.test
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2009-10-22 20:13:18 +0000
+++ b/.bzr-mysql/default.conf	2009-10-31 08:11:10 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-5.5.0-trunk"
+tree_name = "mysql-5.5-trunk"

=== modified file 'config/ac-macros/dtrace.m4'
--- a/config/ac-macros/dtrace.m4	2009-03-06 12:10:58 +0000
+++ b/config/ac-macros/dtrace.m4	2009-10-14 11:15:46 +0000
@@ -14,7 +14,7 @@ DTRACEFLAGS=""
 HAVE_DTRACE=""
 HAVE_DTRACE_DASH_G=""
 if test "$ENABLE_DTRACE" = "yes"; then
-  AC_CHECK_PROGS(DTRACE, dtrace, [not found], [$PATH:/usr/sbin])
+  AC_PATH_PROGS(DTRACE, dtrace, [not found], [$PATH:/usr/sbin])
   if test "$DTRACE" = "not found"; then
     ENABLE_DTRACE="no"
   else

=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2009-10-22 07:28:39 +0000
+++ b/mysql-test/collections/default.experimental	2009-10-27 10:05:06 +0000
@@ -22,6 +22,7 @@ rpl.rpl_innodb_bug30888* @solaris       
 rpl.rpl_plugin_load*  @solaris           # Bug#47146
 rpl.rpl_row_create_table*                # Bug#45576: rpl_row_create_table fails on PB2
 rpl.rpl_log_pos*                         # Bug#47743 2009-10-02 alik rpl.rpl_log_pos fails sporadically
+rpl.rpl_timezone*                        # Bug#47017 2009-10-27 alik rpl_timezone fails on PB-2 with mismatch error
 rpl.rpl_trigger*                         # Bug#46656 2009-09-25 alik InnoDB plugin: memory leaks (Valgrind)
 
 # Declare all NDB-tests in ndb and rpl_ndb test suites experimental.

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2009-10-22 07:28:39 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2009-10-22 20:24:24 +0000
@@ -259,7 +259,8 @@ sub collect_one_suite($)
     else
     {
       $suitedir= my_find_dir($::basedir,
-			     ["mysql-test/suite",
+			     ["share/mysql-test/suite",
+			      "mysql-test/suite",
 			      "mysql-test",
 			      # Look in storage engine specific suite dirs
 			      "storage/*/mysql-test-suites"


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