bk commit into 5.0 tree (pcrews:1.2613) BUG#36026

[pcrews]

Below is the list of changes that have just been committed into a local
5.0 repository of pcrews.  When pcrews does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-01 11:36:03-04:00, pcrews@stripped +1 -0
  Bug#36026 - Test funcs_1.<engine>_trig_03 failing on Windows
  Bug#36028 - Test funcs_1.<engine>_trig_03e failing on Windows
  Bug#36029 - Test funcs_1.<engine>_trig_0407 failing on Windows
  Bug#36030 - Test funcs_1.<engine>_trig_08 failing on Windows
  
  Adding $MASTER_MYSOCK to init_win_path()
  When path names are short, master.sock ends up in MYSQL_TMP_DIR, but with longer path names,
  master.sock ends up in /tmp/<random_string>/ and these tests will fail due to path delimiter difference.
  
  New changeset to start with 5.0 -- Not all of these tests are present in 5.0, but want to keep mysqltest the same

  client/mysqltest.c@stripped, 2008-05-01 11:36:01-04:00, pcrews@stripped +1 -0
    Bug#36026 - Test funcs_1.<engine>_trig_03 failing on Windows
    Bug#36028 - Test funcs_1.<engine>_trig_03e failing on Windows
    Bug#36029 - Test funcs_1.<engine>_trig_0407 failing on Windows
    Bug#36030 - Test funcs_1.<engine>_trig_08 failing on Windows
    
    Adding $MASTER_MYSOCK to init_win_path()
    When path names are short, master.sock ends up in MYSQL_TMP_DIR, but with longer path names,
    master.sock ends up in /tmp/<random_string>/ and these tests will fail due to path delimiter difference.
    
    New changeset to start with 5.0 -- Not all of these tests are present in 5.0, but want to keep mysqltest the same

diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
--- a/client/mysqltest.c	2008-03-23 13:53:33 -04:00
+++ b/client/mysqltest.c	2008-05-01 11:36:01 -04:00
@@ -5464,6 +5464,7 @@ void init_win_path_patterns()
   const char* paths[] = { "$MYSQL_TEST_DIR",
                           "$MYSQL_TMP_DIR",
                           "$MYSQLTEST_VARDIR",
+                          "$MASTER_MYSOCK",
                           "./test/" };
   int num_paths= sizeof(paths)/sizeof(char*);
   int i;