Commit 72b0a6e9 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into neptunus.(none):/home/msvensson/mysql/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
parents 40f5d5ce 889fa8ae

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -1212,8 +1212,8 @@ start_master() 
           $NOT_FIRST_MASTER_EXTRA_OPTS"

  fi



  CUR_MYERR=$MASTER_MYERR

  CUR_MYSOCK=$MASTER_MYSOCK

  CUR_MYERR=$MASTER_MYERR$1

  CUR_MYSOCK=$MASTER_MYSOCK$1



  # For embedded server we collect the server flags and return

  if [ "x$USE_EMBEDDED_SERVER" = "x1" ] ; then