1. 18 Nov, 2004 20 commits
  2. 17 Nov, 2004 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 6ce9ed78
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      6ce9ed78
    • unknown's avatar
      time independent test · d1e4a1f1
      unknown authored
      
      mysql-test/r/ctype_ucs.result:
        result update
      mysql-test/t/ctype_ucs.test:
        time independent
      d1e4a1f1
    • unknown's avatar
      Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code. · ab51882b
      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.
      ab51882b
    • unknown's avatar
      merged · 71da21b2
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      71da21b2
    • unknown's avatar
      test for bug#5528 · 835e0159
      unknown authored
      835e0159
  3. 16 Nov, 2004 15 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3a301ac1
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      3a301ac1
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · d7729a85
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
      
      
      d7729a85
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 0033fa4b
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      0033fa4b
    • unknown's avatar
      key_cache.result, key_cache.test: · 2094d80b
      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.
      2094d80b
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · 190227dc
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      190227dc
    • unknown's avatar
      ha_innodb.cc: · d711df11
      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
      d711df11
    • unknown's avatar
      Fix comment. · a710ebb4
      unknown authored
      
      sql/item_func.cc:
        Fix comment (used_table_cache is completely different from 
        used_tables_cache :)
      a710ebb4
    • unknown's avatar
      ha_innodb.cc: · 7d074100
      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
      7d074100
    • unknown's avatar
      ha_innodb.cc: · 16d735ad
      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
      16d735ad
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · f2db7d57
      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
      f2db7d57
    • unknown's avatar
      ha_ndbcluster.cc: · c9a09e12
      unknown authored
        reverting previous patch
      
      
      sql/ha_ndbcluster.cc:
        reverting previous patch
      c9a09e12
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5aab4ac2
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      
      5aab4ac2
    • unknown's avatar
      ctype-tis620.c: · b226bebc
      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.
      b226bebc
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 996986fe
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6449
      
      
      996986fe
    • unknown's avatar
      Also print warning if there is an ndb->mysql errorcode mapping, this since the... · 9ae173c4
      unknown authored
      Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user
      
      
      
      9ae173c4