1. 27 Mar, 2008 2 commits
  2. 26 Mar, 2008 1 commit
  3. 25 Mar, 2008 2 commits
  4. 22 Mar, 2008 2 commits
  5. 19 Mar, 2008 10 commits
  6. 18 Mar, 2008 1 commit
  7. 17 Mar, 2008 3 commits
  8. 14 Mar, 2008 6 commits
    • unknown's avatar
      Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures · 2e4d2601
      unknown authored
      The problem was that the COM_STMT_SEND_LONG_DATA was sending a response
      packet if the prepared statement wasn't found in the server (due to
      reconnection). The commands COM_STMT_SEND_LONG_DATA and COM_STMT_CLOSE
      should not send any packets, even error packets should not be sent since
      they are not expected by the client API.
      
      The solution is to clear generated during the execution of the aforementioned
      commands and to skip resend of prepared statement commands. Another fix is
      that if the connection breaks during the send of prepared statement command,
      the command is not sent again since the prepared statement is no longer in the
      server.
      
      
      libmysql/libmysql.c:
        The mysql handle might be reset after a reconnection.
        Pass the now used stmt argument to cli_advanced_command.
      sql-common/client.c:
        Don't resend command if the connection broke and it's a prepared
        statement command. If the session is broken, prepared statements
        on the server are gone, set the error accordanly.
      sql/sql_prepare.cc:
        Clear any error set during the execution of the request
        command.
      tests/mysql_client_test.c:
        Fix memory leak by freeing result associated with statement.
        Remove test case for Bug 29948 because it's not reliable in
        5.0 (fixed in 5.1) due to KILL queries sending two packets for
        a thread that kills itself.
      2e4d2601
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 · 90628f25
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
      
      90628f25
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 204c9caf
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      204c9caf
    • unknown's avatar
      Merge trift2.:/MySQL/M50/clone-5.0 · 3bd473f0
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      scripts/make_win_bin_dist:
        Auto merged
      3bd473f0
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · de8d73c7
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      client/mysqldump.c:
        Auto merged
      de8d73c7
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · 6a2c6399
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      6a2c6399
  9. 13 Mar, 2008 2 commits
  10. 12 Mar, 2008 7 commits
    • unknown's avatar
      Bug#34192: mysqldump from mysql 5.0.51 silently fails on dumping \ · 5018c0a9
      unknown authored
      	databases from 4.0 server
      
      mysqldump treated a failure to set the results charset as a severe
      error.  
      
      Now, don't try to set the charset for the SHOW CREATE TABLE statement,
      if remote server's version is earlier than 4.1, which means it 
      doesn't support changing charsets.
      
      
      client/mysqldump.c:
        Don't set the charset for receiving results if the server doesn't 
        support it.
      5018c0a9
    • unknown's avatar
      Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · 2f0ea168
      unknown authored
      into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
      
      2f0ea168
    • unknown's avatar
      A fix for Bug#34643: TRUNCATE crash if trigger and foreign key. · 0dc8565e
      unknown authored
        
      In cases when TRUNCATE was executed by invoking mysql_delete() rather
      than by table recreation (for example, when TRUNCATE was issued on
      InnoDB table with is referenced by foreign key) triggers were invoked.
      In debug builds this also led to crash because of an assertion, which
      assumes that some preliminary actions take place before trigger 
      invocation, which doesn't happen in case of TRUNCATE.
      
      The fix is not to execute triggers in mysql_delete() when this
      function is used by TRUNCATE.
      
      
      mysql-test/r/trigger-trans.result:
        Update result file.
      mysql-test/t/trigger-trans.test:
        A test case for Bug#34643: TRUNCATE crash if trigger and foreign key.
      sql/sql_delete.cc:
        Do not process triggers in TRUNCATE.
      0dc8565e
    • unknown's avatar
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · ddfd9942
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      ddfd9942
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.0 · 242078d0
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      client/mysql.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/view.result:
        Manual merge.
      mysql-test/t/view.test:
        Manual merge.
      scripts/mysql_config.sh:
        Manual merge.
      242078d0
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-4.1 · 70cc07cf
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-4.1-opt
      
      70cc07cf
  11. 11 Mar, 2008 3 commits
    • unknown's avatar
      Post fix for · 52e3c72b
      unknown authored
      WL#4203 Reorganize and fix the data dictionary tests of
              testsuite funcs_1
      because the goal to fix
      Bug#34532 Some funcs_1 tests do not clean up at end of testing
      was partially missed.
      Some minor additional modifications are for
         WL#4304 Cleanup in funcs_1 tests
      
      
      BitKeeper/deleted/.del-innodb_triggers.result:
        Rename: mysql-test/suite/funcs_1/r/innodb_triggers.result -> BitKeeper/deleted/.del-innodb_triggers.result
      BitKeeper/deleted/.del-memory_triggers.result:
        Rename: mysql-test/suite/funcs_1/r/memory_triggers.result -> BitKeeper/deleted/.del-memory_triggers.result
      BitKeeper/deleted/.del-myisam_triggers.result:
        Rename: mysql-test/suite/funcs_1/r/myisam_triggers.result -> BitKeeper/deleted/.del-myisam_triggers.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/cursors/cursors_master.test:
        Backport of file in 5.1
      mysql-test/suite/funcs_1/datadict/datadict_load.inc:
        Cleanup
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_innodb.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_memory.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_myisam.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_ndb.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_innodb.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_memory.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_myisam.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_ndb.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_views.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Updated results
      mysql-test/suite/funcs_1/t/innodb_storedproc.test:
        Backport of file in 5.1
      mysql-test/suite/funcs_1/t/memory_storedproc.test:
        Backport of file in 5.1
      mysql-test/suite/funcs_1/t/myisam_storedproc.test:
        Backport of file in 5.1
      mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
        Cleanup
      mysql-test/suite/funcs_1/views/views_master.inc:
        Backport of file in 5.1 which got many fixes for instabilities
        and other improvements
      52e3c72b
    • unknown's avatar
      make_win_bin_dist: · a13af34c
      unknown authored
        Include .pdb files for tools and libraries (bug#35104)
      
      
      scripts/make_win_bin_dist:
        Include .pdb files for tools and libraries (bug#35104)
      a13af34c
    • unknown's avatar
      BUG#31024: STOP SLAVE does not stop attempted connect()s · d6c738c0
      unknown authored
      Problem: if the IO slave thread is attempting to connect,
      STOP SLAVE waits for the attempt to finish. 
      It may take a long time.
      Fix: don't wait, stop the slave immediately.
      
      
      sql/slave.cc:
        Send a SIGALRM signal to the slave thread when stopping it (using
        pthread_kill()). This breaks current socket(), connect(), poll() etc.
        calls, and makes the subsequent thd->awake() call effective.
        
        Also, move the definition of KICK_SLAVE to slave.cc.
      sql/sql_repl.h:
        Removed KICK_SLAVE and inlined it in slave.cc because:
         - it was only called once, so better to make it local to where it is used
         - it needed to include a preprocessor conditional in the middle
      d6c738c0
  12. 10 Mar, 2008 1 commit