1. 20 Feb, 2007 2 commits
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 · 659cc288
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      659cc288
    • unknown's avatar
      Bug#20166 mysql-test-run.pl does not test system privilege tables creation · 88729ddb
      unknown authored
       - Add test of bootstrap mode
       - Make mysqld return error if bootstrap failed  
      
      
      mysql-test/mysql-test-run.pl:
        Remove options --skip-grant-tables as that is always
        turned on by --bootstrap
        Remove options --console as that does not affect --bootstrap mode
        at all
        Add environment variable MYSQLD_BOOTSTRAP_CMD containing path 
        to mysqld and the arguments used for bootstrap
      sql/sql_parse.cc:
        Abort bootstrap if execution fails
        Report error to stderr/log
      mysql-test/r/bootstrap.result:
        New BitKeeper file ``mysql-test/r/bootstrap.result''
      mysql-test/t/bootstrap.test:
        New BitKeeper file ``mysql-test/t/bootstrap.test''
      88729ddb
  2. 19 Feb, 2007 11 commits
  3. 16 Feb, 2007 10 commits
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 13ba8e92
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/t/mysql.test:
        Auto merged
      13ba8e92
    • unknown's avatar
      Use " instead of ' to avoid win problem with ' · f951d4cc
      unknown authored
      f951d4cc
    • unknown's avatar
      Add echo to be compiled · c7817b7e
      unknown authored
      c7817b7e
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 136b292f
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~7:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Manual merge with add of --debug-info
      136b292f
    • unknown's avatar
      Add echo.c to be built on Windows · 20c3ffe8
      unknown authored
      20c3ffe8
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 3c9b3c7e
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      3c9b3c7e
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · eb34be43
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      eb34be43
    • unknown's avatar
      Merge 192.168.0.10:mysql/mysql-4.1-maint · 3a56c79b
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
      
      
      client/mysqltest.c:
        Auto merged
      3a56c79b
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · bf690515
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/r/order_by.result:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/t/order_by.test:
        SCCS merged
      bf690515
    • unknown's avatar
      Workaround for problem where cygwin's bash/sh randomly fails with error 128 which · 0a97f7ba
      unknown authored
      mainly occurs on win2003 64bit.
       - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..." 
      
      
      client/mysqltest.c:
        Workaround the problem with "echo" in windows not behaving like "echo" in Unix.
        - Replace "--exec echo ..." with "--exec <path to mysqltest>\echo.exe" thus forcing
          use of our own echo implementation which baheves like on Unix.
        - The above change makes it possible to remove the need to execute all --exec's
          inside cygwin. Add ifdefs to only use use cygwin's bash conditionally
      mysql-test/lib/mtr_misc.pl:
        Add function for converting to the OS's native format
      mysql-test/mysql-test-run.pl:
        Convert path to executables to "windows native" (c:\<path>\) instead of "mixed"(c:/<path>) mode
        necessary for pipes and redirects to work properly in cmd.exe
      client/echo.c:
        New BitKeeper file ``client/echo.c''
      0a97f7ba
  4. 15 Feb, 2007 10 commits
  5. 14 Feb, 2007 7 commits