1. 16 Feb, 2007 5 commits
    • unknown's avatar
      Add echo.c to be built on Windows · 6660006b
      unknown authored
      6660006b
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 2214c207
      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
      2214c207
    • unknown's avatar
      Merge 192.168.0.10:mysql/mysql-4.1-maint · c6e1de4c
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
      
      
      client/mysqltest.c:
        Auto merged
      c6e1de4c
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 89cbc572
      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
      89cbc572
    • unknown's avatar
      Workaround for problem where cygwin's bash/sh randomly fails with error 128 which · a843a05f
      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''
      a843a05f
  2. 15 Feb, 2007 5 commits
  3. 14 Feb, 2007 8 commits
    • unknown's avatar
      Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126 · 5097c6fc
      unknown authored
      into  calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint
      
      
      sql/item.cc:
        Auto merged
      mysql-test/r/order_by.result:
        Manual merge.
      mysql-test/t/order_by.test:
        Manual merge.
      5097c6fc
    • unknown's avatar
      Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126 · 48be0a2f
      unknown authored
      into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint
      
      
      sql/item.cc:
        Auto merged
      mysql-test/r/order_by.result:
        Manual merge.
      mysql-test/t/order_by.test:
        Manual merge.
      48be0a2f
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 1d549b95
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysqltest.c:
        Auto merged
      1d549b95
    • unknown's avatar
      Use my_vsnprintf instead of vsnprintf · 557f6169
      unknown authored
      557f6169
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9d66be72
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      sql/mysql_priv.h:
        Auto merged
      9d66be72
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628 · 555aed64
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      555aed64
    • unknown's avatar
      Bug#18628 mysql-test-run: security problem(part1) · c4ae01e6
      unknown authored
       - Implement --secure-file-priv=<dir> option that limits
        "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
        with files in specified dir.
       - Use above option for mysqld in mysql-test-run.pl 
      
      
      mysql-test/mysql-test-run.pl:
        Add usage of --secure-file-priv=vardir when starting mysqld
      mysql-test/r/loaddata.result:
        Update test result after adding test to check that secure-file-priv
        works for "load data" and "load_file"
      mysql-test/r/outfile.result:
        Update result
      mysql-test/r/query_cache.result:
        Can't load from outside of vardir anymore
      mysql-test/r/type_blob.result:
        Can't load from outside of vardir anymore
      mysql-test/t/loaddata.test:
        Update test result after adding test to check that secure-file-priv 
        works for "load data" and "load_file"
      mysql-test/t/outfile.test:
        Update test result after adding test to check that secure-file-priv
        works for "SELECT .. INTO OUTFILE"
      mysql-test/t/query_cache.test:
        Can't load from outside of vardir anymore
      mysql-test/t/type_blob.test:
        Can't load from outside of vardir anymore
      sql/item_strfunc.cc:
        Check that the path "load_file" uses for the file is within 
        what's specified with --secure-file-priv
      sql/mysql_priv.h:
        Add secure_file_priv
      sql/mysqld.cc:
        Add "--secure_file_priv"
      sql/set_var.cc:
        Add variable "secure_file_priv" to "show variables"
      sql/sql_class.cc:
        Check that the path "load_file" uses for the file is within 
        what's specified with --secure-file-priv
      sql/sql_class.h:
        Fix spelling error
      sql/sql_load.cc:
        Check that the path "load_file" uses for the file is within 
        what's specified with --secure-file-priv
      sql/share/errmsg.txt:
        Fix swedish error message for ER_OPTION_PREVENTS_STATMENT wich was hardcoded
        to --skip-grant-tables
      c4ae01e6
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 12d6c6eb
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      12d6c6eb
  4. 13 Feb, 2007 13 commits
  5. 12 Feb, 2007 9 commits