1. 09 Nov, 2006 1 commit
  2. 07 Nov, 2006 3 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic · d167b60f
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic
      
      
      README:
        Auto merged
      d167b60f
    • unknown's avatar
      make_binary_distribution.sh: · 22655de1
      unknown authored
        Added LICENSE.mysql, removed LICENSE.doc README.NW.
        Removed obselete section about MySQLEULA.txt and README.NW.
      README:
        Added reference to the EXCEPTIONS-CLIENT file.
        Changed reference to the commercial license file.
        Corrected references into chapters in the manual.
      .del-MySQLEULA.txt~4a1afd9284f9be5a:
        Delete: Docs/MySQLEULA.txt
      
      
      README:
        Added reference to the EXCEPTIONS-CLIENT file.
        Changed reference to the commercial license file.
        Corrected references into chapters in the manual.
      BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
        Delete: Docs/MySQLEULA.txt
      scripts/make_binary_distribution.sh:
        Added LICENSE.mysql, removed LICENSE.doc README.NW.
        Removed obselete section about MySQLEULA.txt and README.NW.
      22655de1
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · a44762bc
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-4.1-engines
      
      
      a44762bc
  3. 03 Nov, 2006 1 commit
  4. 02 Nov, 2006 8 commits
  5. 01 Nov, 2006 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2886e07d
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      2886e07d
    • unknown's avatar
      BUG#23312 - server hangs 'closing tables' with insert delayed,flush · 88f55bf8
      unknown authored
                  tables,alter table
      Deadlock could happen if there are delayed insert + flush tables + alter table
      running concurrently.
      
      This is fixed by removing a redundant mutex lock when killing a delayed thread.
      
      
      sql/sql_insert.cc:
        Removed redundant delayed thread mutex lock, that could result in a deadlock.
        LOCK_delayed_insert is sufficient to be sure that no other thread frees delayed
        handler.
      88f55bf8
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · 07978008
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      07978008
    • unknown's avatar
      Merge 192.168.0.10:mysql/mysql-4.1-maint · bc7b0a2e
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      bc7b0a2e
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/bug22828/my41-bug22828 · 2d1215f4
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
      
      
      mysys/my_chsize.c:
        Auto merged
      2d1215f4
  6. 31 Oct, 2006 5 commits
  7. 30 Oct, 2006 4 commits
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime · 49c9509a
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
      
      
      49c9509a
    • unknown's avatar
      BUG#21915: Changing limits of table_cache when setting max_connections · 885dc1cb
      unknown authored
      If the user has specified --max-connections=N or --table-open-cache=M
      options to the server, a warning could be given that some values were
      recalculated, and table-open-cache could be assigned greater value.
      
      Note that both warning and increase of table-open-cache were totally
      harmless.
      
      This patch fixes recalculation code to ensure that table-open-cache will
      be never increased automatically and that a warning will be given only if
      some values had to be decreased due to operating system limits.
      
      No test case is provided because we neither can't predict nor control
      operating system limits for maximal number of open files.
      
      
      sql/mysql_priv.h:
        Add constants for table_cache minimum and default values.
      sql/mysqld.cc:
        Fix max_connections and table_cache_size re-computation.
      885dc1cb
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · 9711d722
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      9711d722
    • unknown's avatar
      Bug#18654 Test is timing-dependent and fails from scheduling effects (?) · c2b8a63c
      unknown authored
       - Wait in loop with small sleep until tables has been renamed
      
      
      mysql-test/t/rename.test:
        To avoid scheduling effects wait for the tables to be renamed in a loop with small sleeps
        before continuing with tests
      mysql-test/include/wait_for_query_to_suceed.inc:
        New BitKeeper file ``mysql-test/include/wait_for_query_to_suceed.inc''
      c2b8a63c
  8. 27 Oct, 2006 7 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 142a4485
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      sql/sql_select.cc:
        Auto merged
      142a4485
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 3e2dacae
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      3e2dacae
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 75776305
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      75776305
    • unknown's avatar
      ndb - valgrind · 11ac4907
      unknown authored
        Still leakage, make sure all unlinked operations are put back so they will be release
        (on failing blob operations, when AO_IgnoreError)
      
      
      ndb/src/ndbapi/NdbConnection.cpp:
        Still leakage, make sure all unlinked operations are put back so they will be release
      11ac4907
    • unknown's avatar
      Update the rules for abi_check · 928fa57a
      unknown authored
      
      include/Makefile.am:
        Move m_ctype.h from BUILT_SOURCES, it's in vcs
        Update the rule for abi_check
      include/mysql_h.ic:
        Update the refernce and rename it to mysql_h.ic
      928fa57a
    • unknown's avatar
      Fix for bug #23412: delete rows with null date field · d2c90fcb
      unknown authored
      Backport of the fix for bug #8143: A date with value 0 is treated as a NULL value
      
      
      mysql-test/r/delete.result:
        Fix for bug #23412: delete rows with null date field
          - test result
      mysql-test/t/delete.test:
        Fix for bug #23412: delete rows with null date field
          - test case
      sql/sql_delete.cc:
        Fix for bug #23412: delete rows with null date field
          - during SELECT queries processing we convert 'date[time]_field is null'                   
            conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null                  
            DATE and DATETIME fields. To be consistent, we have to do the same for DELETE            
            queries. So we should call remove_eq_conds() in the mysql_delete() as well.              
            Also it may simplify and speed up DELETE queries execution.
      d2c90fcb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 447c336d
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-merge
      
      
      447c336d
  9. 26 Oct, 2006 1 commit
  10. 25 Oct, 2006 5 commits