1. 18 Nov, 2004 19 commits
  2. 17 Nov, 2004 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 2d22575d
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      2d22575d
    • unknown's avatar
      time independent test · 28afd7cc
      unknown authored
      
      mysql-test/r/ctype_ucs.result:
        result update
      mysql-test/t/ctype_ucs.test:
        time independent
      28afd7cc
    • unknown's avatar
      Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code. · cfc1b1dc
      unknown authored
      Moving the part of user_var.test using UCS2 to ctype_ucs.test
      
      
      mysql-test/r/ctype_ucs.result:
        result update
      mysql-test/r/user_var.result:
        result update
      mysql-test/t/ctype_ucs.test:
        importing test piece from user_var.test
      mysql-test/t/user_var.test:
        using UCS2 in this test fails on non-USC2-capable binaries, so let's move this piece to ctype_ucs.test.
      sql/slave.cc:
        changing arg type to uint32* (as what is used in this arg is &thd->db_length which is uint32*)
      sql/slave.h:
        changing arg type to uint32*
      sql/sql_parse.cc:
        changing arg types to uint32, as what is used in these args is a create_field::length which is uint32.
      cfc1b1dc
    • unknown's avatar
      merged · 713e595a
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      713e595a
    • unknown's avatar
      test for bug#5528 · 395a28b0
      unknown authored
      395a28b0
    • unknown's avatar
      Merge · 5dd8dbdc
      unknown authored
      
      sql/ha_ndbcluster.cc:
        SCCS merged
      5dd8dbdc
    • unknown's avatar
      Enabled usage of new system variables for ndb · 40eaf1a5
      unknown authored
        - ndb_use_exact_count
        - ndb_autoincrement_prefetch_sz
        - ndb_use_transactions
        - ndb_force_send
      moved "inlined" functions to .cc file since they are virtual anyways
      enabled printout od ndb errors in warnings even if mapping existst to mysql error code
      
      
      sql/ha_ndbcluster.h:
        Enabled usage of new system variables for ndb
          - ndb_use_exact_count
          - ndb_autoincrement_prefetch_sz
          - ndb_use_transactions
          - ndb_force_send
        moved "inlined" functions to .cc file since they are virtual anyways
      sql/mysqld.cc:
        Enabled usage of new system variables for ndb
          - ndb_use_exact_count
          - ndb_autoincrement_prefetch_sz
          - ndb_use_transactions
          - ndb_force_send
      sql/set_var.cc:
        Enabled usage of new system variables for ndb
          - ndb_use_exact_count
          - ndb_autoincrement_prefetch_sz
          - ndb_use_transactions
          - ndb_force_send
      sql/sql_class.h:
        Enabled usage of new system variables for ndb
          - ndb_use_exact_count
          - ndb_autoincrement_prefetch_sz
          - ndb_use_transactions
          - ndb_force_send
      40eaf1a5
    • unknown's avatar
      enabled having system tables in ndb · d28c5b98
      unknown authored
      d28c5b98
  3. 16 Nov, 2004 13 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 83317e5b
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      83317e5b
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · c66db6ce
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
      
      c66db6ce
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 5decc21b
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      5decc21b
    • unknown's avatar
      key_cache.result, key_cache.test: · 1001becf
      unknown authored
        Added a test case for bug #6447.
      mf_keycache.c:
        Fixed bug #6447. Erronious code in the key_cache_read function
        caused problems when reading key blocks with offset>0 into
        key cache. The code of key_cache_insert and key_cache_write
        was modified similarly.
      
      
      mysys/mf_keycache.c:
        Fixed bug #6447. Erronious code in the key_cache_read function
        caused problems when reading key blocks with offset>0 into
        key cache. The code of key_cache_insert and key_cache_write
        was modified similarly.
      mysql-test/t/key_cache.test:
        Added a test case for bug #6447.
      mysql-test/r/key_cache.result:
        Added a test case for bug #6447.
      1001becf
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · c659d1b4
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      c659d1b4
    • unknown's avatar
      ha_innodb.cc: · 341dba87
      unknown authored
        Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this
      
      
      sql/ha_innodb.cc:
        Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this
      341dba87
    • unknown's avatar
      Fix comment. · b0f26d2c
      unknown authored
      
      sql/item_func.cc:
        Fix comment (used_table_cache is completely different from 
        used_tables_cache :)
      b0f26d2c
    • unknown's avatar
      ha_innodb.cc: · c612fb50
      unknown authored
      Manually ported this bug fix from 4.0: 
       Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
      
      
      sql/ha_innodb.cc:
        Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
      c612fb50
    • unknown's avatar
      ha_innodb.cc: · 305a9468
      unknown authored
        Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
      
      
      sql/ha_innodb.cc:
        Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
      305a9468
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · fa0254d6
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
      
      
      heap/hp_hash.c:
        Auto merged
      mysql-test/r/heap.result:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      fa0254d6
    • unknown's avatar
      ha_ndbcluster.cc: · 811143ea
      unknown authored
        reverting previous patch
      
      
      sql/ha_ndbcluster.cc:
        reverting previous patch
      811143ea
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 66ec4f7a
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      66ec4f7a
    • unknown's avatar
      ctype-tis620.c: · 4b7b8565
      unknown authored
        Space allocated didn't take in account trailing '\0' bytes.
      
      
      strings/ctype-tis620.c:
        Space allocated didn't take in account trailing '\0' bytes.
      4b7b8565