1. 11 Oct, 2006 2 commits
    • unknown's avatar
      Fix some bad code in mysqltest.c and mysql-test-run.pl which could cause... · da0b4e97
      unknown authored
      Fix some bad code in mysqltest.c and mysql-test-run.pl which could cause segfault / wrong LD_LIBRARY_PATH settings.
      
      
      client/mysqltest.c:
        Remove vsnprintf() and DBUG_PRINT from die() function, as it's not portable to Windows, and it's not allowed to call vsnprintf() and then vfprintf() with the same args.
        
        Can't just print the buffer here, because the buffer is a fixed size.  If the message is longer than will fit int he buffer, it would get truncated on Unix, and the full thing would be printed on Windows.  This DBUG_PRINT isn't important enough for this hassle, so just get rid of it.
      mysql-test/mysql-test-run.pl:
        Remove bogus quoting of $ENV{LD_LIBRARY_PATH} and $ENV{DYLD_LIBRARY_PATH} in environment_setup().
      da0b4e97
    • unknown's avatar
      BUG#21524 ER_CANT_OPEN_LIBRARY output message used to confuse mysqltest on... · 46a3e809
      unknown authored
      BUG#21524 ER_CANT_OPEN_LIBRARY output message used to confuse mysqltest on Solaris. Varying part of the message is now suppressed 
      
      
      mysql-test/r/ps.result:
        ps.result updated
      mysql-test/t/ps.test:
        The error code and the additional output grepped out of ER_CANT_OPEN_LIBRARY message due to the output varies across different platforms
      46a3e809
  2. 10 Oct, 2006 1 commit
    • unknown's avatar
      BUG#21524 ps.test updated to meet recent changes in SQL parser · de443be6
      unknown authored
      
      mysql-test/r/ps.result:
        brand new ps.result recorded out of updated ps.test output
      mysql-test/t/disabled.def:
        ps.test enabled anew
      mysql-test/t/ps.test:
        ps.test updated to ensure FLUSH/RESET are not allowed in stored functions at both parse and execution time
      de443be6
  3. 09 Oct, 2006 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 525a7cb5
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
      
      
      BitKeeper/etc/collapsed:
        auto-union
      client/mysql.cc:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      525a7cb5
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583 · 7a717661
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
      
      
      BitKeeper/etc/collapsed:
        auto-union
      client/mysql.cc:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      7a717661
    • unknown's avatar
      Bug#17583: mysql drops connection when stdout is not writable · 6c91170e
      unknown authored
      Porting forward tests to replacement files.
      
      
      mysql-test/r/mysql.result:
        Ported changes from previous commit to new file.
      mysql-test/t/mysql.test:
        Ported changes from previous commit to new file.
      6c91170e
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583 · 426b0f45
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
      
      
      BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
        Delete: BitKeeper/etc/collapsed
      BitKeeper/etc/collapsed:
        'Auto converge'
      client/mysql.cc:
        Auto merged
      BitKeeper/deleted/.del-mysql_client.result:
        File is gone.
      BitKeeper/deleted/.del-mysql_client.test:
        File is gone.
      426b0f45
    • unknown's avatar
      Bug#17583: mysql drops connection when stdout is not writable · 76b353d3
      unknown authored
      When the client program had its stdout file descriptor closed by the calling
      shell, after some amount of work (enough to fill a socket buffer) the server 
      would complain about a packet error and then disconnect the client.
      
      This is a serious security problem.  If stdout is closed before the mysql is
      exec()d, then the first socket() call allocates file number 1 to communicate
      with the server.  Subsequent write()s to that file number (as when printing
      results that come back from the database) go back to the server instead in 
      the command channel.  So, one should be able to craft data which, upon being
      selected back from the server to the client, and injected into the command
      stream become valid MySQL protocol to do something nasty when sent /back/ to 
      the server.
      
      The solution is to close explicitly the file descriptor that we *printf() to, 
      so that the libc layer and the OS layer both agree that the file is closed.
      
      
      BitKeeper/etc/collapsed:
        BitKeeper file /home/cmiller/work/mysql/bug17583/my41-bug17583/BitKeeper/etc/collapsed
      client/mysql.cc:
        If standard output is not open (specifically, if dup() of its file number 
        fails) then we explicitly close it so that future uses of the file descriptor
        behave correctly for a closed file.
      mysql-test/r/mysql_client.result:
        Prove that the problem of writing SQL output to the command socket no longer
        exists.
      mysql-test/t/mysql_client.test:
        Prove that the problem of writing SQL output to the command socket no longer
        exists.
      76b353d3
  4. 08 Oct, 2006 10 commits
  5. 07 Oct, 2006 9 commits
  6. 06 Oct, 2006 13 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · d3cc3037
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      d3cc3037
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · e96241a4
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      e96241a4
    • unknown's avatar
      Add error handling of failure to start server to "run_testcase_start_servers" · 64329b16
      unknown authored
      
      mysql-test/lib/mtr_report.pl:
        Use tinfo's comment as primary place to look for error message
      64329b16
    • unknown's avatar
      Remove commented out testcases from disabled.def · eccf9e28
      unknown authored
      Remove the im_* test, they are fixed according to the referenced bugs
       
      
      
      eccf9e28
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 62e2b914
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      BitKeeper/etc/collapsed:
        auto-union
      BitKeeper/deleted/.del-mtr_im.pl:
        Auto merged
      BitKeeper/deleted/.del-mtr_stress.pl:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/im_daemon_life_cycle.imtest:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      62e2b914
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 89d0432d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      89d0432d
    • unknown's avatar
      Fix problem with specifying vardir, mysql_version_id was not yet available... · e16d9851
      unknown authored
      Fix problem with specifying vardir, mysql_version_id was not yet available when vardir arguments is checked
      Move the code to look for exe_mysqld earlier => to initial_setup
      Fix warnings detected by running with "diagnostics"
      Remove unused option "opt_result_ext"
      Init "path_ndb_examples_dir"
      
      
      mysql-test/lib/mtr_cases.pl:
        Set default number of slave to 0
        Remove unused/uninitialized "$opt_result_ext"
      mysql-test/lib/mtr_report.pl:
        Remove unused/uninitialized "$opt_result_ext"
      e16d9851
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new-maint · a5fa6854
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      BitKeeper/etc/collapsed:
        auto-union
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/set_var.cc:
        Auto merged
      a5fa6854
    • unknown's avatar
      Turn on reconnect · 0fd531ff
      unknown authored
      0fd531ff
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 94b03837
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      BitKeeper/etc/collapsed:
        auto-union
      BitKeeper/etc/ignore:
        auto-union
      client/mysql.cc:
        Auto merged
      include/m_ctype.h:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      configure.in:
        Use 5.1 version of configure.in
      94b03837
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 285374f3
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      285374f3
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools · 247f85f7
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      247f85f7
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools · edadaf97
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
      
      
      edadaf97