bk commit into 5.1 tree (pcrews:1.2575) BUG#36026

[pcrews]

Below is the list of changes that have just been committed into a local
5.1 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-04-30 21:19:35-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
  
  Added $MASTER_MYSOCK to init_win_path()
  When path names are long, master.sock end up in /tmp/<random_string>
  rather than MYSQL_TMP_DIR -- not as likely to fail on dev machines
  as it would on Pushbuild
  
  Without the patch, --replace fails due to difference in UNIX vs. Windows path delimiters

  client/mysqltest.c@stripped, 2008-04-30 21:19:33-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
    
    Added $MASTER_MYSOCK to init_win_path()
    When path names are long, master.sock end up in /tmp/<random_string>
    rather than MYSQL_TMP_DIR -- not as likely to fail on dev machines
    as it would on Pushbuild
    
    Without the patch, --replace fails due to difference in UNIX vs. Windows path delimiters

diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
--- a/client/mysqltest.c	2008-03-30 07:12:23 -04:00
+++ b/client/mysqltest.c	2008-04-30 21:19:33 -04:00
@@ -5490,6 +5490,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;