1. 19 Jan, 2006 9 commits
  2. 18 Jan, 2006 11 commits
    • unknown's avatar
      A fix and a test case for Bug#15613 "libmysqlclient API function · 1e8e302e
      unknown authored
       mysql_stmt_prepare returns wrong field length"
      
      
      sql/protocol.cc:
        A fix for Bug#15613: make sure that result set column length
        is evaluated correctly for BLOB/TEXT columns.
      tests/mysql_client_test.c:
        A test case for Bug#15613
      1e8e302e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · aff3affa
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      aff3affa
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · f0fe29f1
      unknown authored
      into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0
      
      
      f0fe29f1
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · ccd0ae3c
      unknown authored
      into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0
      
      
      sql/sql_acl.cc:
        Auto merged
      ccd0ae3c
    • unknown's avatar
      Applied patch recieved from Marko: · e3f0690d
      unknown authored
       Make innodb_thread_concurrency 0 by default, and extend the usable
       range from 0 to 1000 (0 disables the thread throttling).
      
      
      innobase/include/srv0srv.h:
        Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
      innobase/srv/srv0srv.c:
        Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
      mysql-test/r/innodb.result:
        innodb_thread_concurrency is 0..1000 now, and the default is 0.
      mysql-test/t/innodb.test:
        innodb_thread_concurrency is 0..1000 now.
      sql/ha_innodb.cc:
        Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
      sql/mysqld.cc:
        innodb_thread_concurrency is 0..1000 now, and 0 (the default)
         disables the thread throttling.
      e3f0690d
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · f9bef505
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      BitKeeper/etc/ignore:
        auto-union
      libmysql/Makefile.shared:
        Auto merged
      configure.in:
        Manual merge.
      libmysql/libmysql.c:
        Manual merge.
      tests/mysql_client_test.c:
        Manual merge.
      f9bef505
    • unknown's avatar
      Applied patch recieved from Marko: · 74f499fa
      unknown authored
       Make innodb_flush_log_at_trx_commit a settable global variable.
      
      
      innobase/include/srv0srv.h:
        Change the type of srv_flush_log_at_trx_commit.
      innobase/srv/srv0srv.c:
        Change the type of srv_flush_log_at_trx_commit.
      sql/ha_innodb.cc:
        Remove innobase_flush_log_at_trx_commit.
         (Set srv_flush_log_at_trx_commit directly).
      sql/ha_innodb.h:
        Remove innobase_flush_log_at_trx_commit.
         (Set srv_flush_log_at_trx_commit directly).
      sql/mysqld.cc:
        Bypass the variable innobase innobase_flush_log_at_trx_commit.
      sql/set_var.cc:
        Make innodb_flush_log_at_trx_commit a settable global variable.
      74f499fa
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 596666f7
      unknown authored
      into mysql.com:/M50/merge-5.0
      
      
      596666f7
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · ec6ce9a7
      unknown authored
      into mysql.com:/M50/merge-5.0
      
      
      ec6ce9a7
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 5755c787
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124
      
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      5755c787
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 98448401
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11331
      
      
      98448401
  3. 17 Jan, 2006 20 commits