1. 13 Oct, 2006 3 commits
  2. 12 Oct, 2006 11 commits
  3. 11 Oct, 2006 13 commits
    • unknown's avatar
      Fixes for embedded server test · d6d46923
      unknown authored
      
      client/mysqltest.c:
        Fix typo
      d6d46923
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · f29fb041
      unknown authored
      into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
      
      
      f29fb041
    • unknown's avatar
      mtr_im_stop returns 1 if all is well · 6c0ad741
      unknown authored
      6c0ad741
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 89924c58
      unknown authored
      into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
      
      
      sql/item_timefunc.cc:
        Auto merged
      89924c58
    • unknown's avatar
      Improve restart logic all code to detect restart is now in the functions · a0081378
      unknown authored
      'run_testcase_need_master/slave_restart'
      Remove the faulty qw
      Only look for mysql_fix_privilege_tables if not windows
      
      
      mysql-test/lib/mtr_cases.pl:
        Move all code to determine when to restart into 'run_testcase_need_master/slave_restart' 
        Add possibility to wite --force-restart in -master.opt file, this will force a restart and
        since master is not started with any special options there is no need to restart
        again afterwards.
      mysql-test/mysql-test-run.pl:
        Remove the qw surrounding ENV{'LD_LIBRARY_PATH'}
        Only look for the sh script mysql_fix_privileges when not on windows
        Remove warnings about using unitialized variables
        Improve the restart logic, eall code to determine when to restart is
        now in run_testcase_need_master_restart and run_testcase_need_slave_restart
      mysql-test/t/bdb-alter-table-2-master.opt:
        Use --force-restart
      mysql-test/t/not_embedded_server-master.opt:
        Use --force-restart
      a0081378
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 175209d2
      unknown authored
      into  example.com:/work/bug23074/my41-bug23074
      
      
      175209d2
    • unknown's avatar
      Cset exclude: Kristofer.Pettersson@naruto.|ChangeSet|20060922092201|15946 · 18b91b02
      unknown authored
      
      sql/item_timefunc.cc:
        Exclude
      18b91b02
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 5623f2e9
      unknown authored
      into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
      
      
      sql/item_timefunc.cc:
        Auto merged
      5623f2e9
    • unknown's avatar
      Merge polly.local:/tmp/maint/bug11655/my41-bug11655 · 3baf2034
      unknown authored
      into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
      
      
      sql/field.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      mysql-test/r/func_time.result:
        Manually merged
      mysql-test/t/func_time.test:
        Manually merged
      3baf2034
    • unknown's avatar
      Fix some bad code in mysqltest.c which cause segfault · 3caef95e
      unknown authored
      
      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.
      3caef95e
    • unknown's avatar
      Fix a typo regarding checking whether HA_VAR_LENGTH_KEY is · a4a319cf
      unknown authored
      set. This has always worked because when flag is !=0 then
      HA_VAR_LENGTH_KEY is always set. Therefore, a test case cannot
      reveal a faulty behavior.
      
      Fix for bug#23074: typo in myisam/sort.c
      
      
      myisam/sort.c:
        fix typo. Nevertheless, it has worked as expected
        because when a bit in flag is set HA_VAR_LENGTH_KEY has
        been always set too. Actually, no problem exposed through
        DDL.
      a4a319cf
    • unknown's avatar
      Fix for bug #22728 "Handler_rollback value is growing". · ca126a2b
      unknown authored
      The bug is present only in 4.1, will be null-merged to 5.0
      
      For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.
      
      
      mysql-test/r/innodb_mysql.result:
        Added testcase for bug #22728 "Handler_rollback value is growing"
      mysql-test/t/innodb_mysql.test:
        Added testcase for bug #22728 "Handler_rollback value is growing"
      sql/handler.cc:
        For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.
      ca126a2b
    • unknown's avatar
      Merge naruto.:C:/cpp/bug21811/my41-bug21811 · fedfd803
      unknown authored
      into  naruto.:C:/cpp/mysql-4.1-maint
      
      
      sql/item_timefunc.cc:
        Auto merged
      fedfd803
  4. 09 Oct, 2006 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 57efa768
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583
      
      
      client/mysql.cc:
        Auto merged
      57efa768
    • 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
  5. 08 Oct, 2006 6 commits
  6. 07 Oct, 2006 5 commits