1. 04 Dec, 2005 2 commits
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · 69e0cc6d
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      client/mysql.cc:
        Auto merged
      client/mysqladmin.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      isam/isamchk.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Merged from 4.0.
      69e0cc6d
    • unknown's avatar
      A set of Netware related patches. · 60f2e7a9
      unknown authored
      
      client/mysql.cc:
        Fixed option name.
      client/mysqladmin.c:
        Fixed option name.
      client/mysqlbinlog.cc:
        Fixed option name.
      client/mysqlcheck.c:
        Fixed option name.
      client/mysqldump.c:
        Fixed option name.
      client/mysqlimport.c:
        Fixed option name.
      client/mysqlshow.c:
        Fixed option name.
      isam/isamchk.c:
        Fixed option name.
      myisam/myisamchk.c:
        Fixed option name.
      myisam/myisampack.c:
        Fixed option name.
      sql/sql_parse.cc:
        Fix problem with kill connection on NetWare.
      60f2e7a9
  2. 02 Dec, 2005 2 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f173e09f
      unknown authored
      into moonbone.local:/work/15028-bug-4.1-mysql
      
      
      f173e09f
    • unknown's avatar
      BUG#15425 Small window for NF during backup failing without error · a1a803b4
      unknown authored
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
        all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
        error in FSAPPENDCONF is hit.
        
        This would mean that no error code was set for the backup and that it would
        be incomplete as not all IO had been written to disk before the node crash.
        This would not be reported to the user.
        
        So the backup would appear to succeed but it really didn't.
        
        The window for this is rather small though.
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)
      a1a803b4
  3. 01 Dec, 2005 2 commits
    • unknown's avatar
      Fix bug#15028 Multitable update returns different numbers of matched rows · 136c8173
      unknown authored
      depending on table order
      
      multi_update::send_data() was counting updates, not updated rows. Thus if one 
      record have several updates it will be counted several times in 'rows matched'
      but updated only once.
      
      multi_update::send_data() now counts only unique rows.
      
      
      sql/sql_update.cc:
        Fix bug#15028  Multitable update returns different numbers of matched rows
        depending on table order
        multi_update::send_data() now counts only unique rows.
      mysql-test/t/update.test:
        Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
      mysql-test/r/update.result:
        Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
      136c8173
    • unknown's avatar
      We should skip beggining '(' characters when test query on possibility · a050707b
      unknown authored
      to be in the query cache. (BUG#14652)
      
      
      mysql-test/r/query_cache.result:
        BUG#14652 test suite.
      mysql-test/t/query_cache.test:
        BUG#14652 test suite.
      sql/sql_cache.cc:
        We should skip beggining '(' characters when test query on possibility
        to be in the query cache.
      a050707b
  4. 30 Nov, 2005 1 commit
  5. 29 Nov, 2005 5 commits
  6. 28 Nov, 2005 5 commits
  7. 26 Nov, 2005 2 commits
  8. 25 Nov, 2005 3 commits
    • unknown's avatar
      A fix and a test case for Bug#14410 "Crash in Enum or Set type in · 2a1ae3a5
      unknown authored
      CREATE TABLE and PS/SP": make sure that 'typelib' object for
      ENUM values and 'Item_string' object for DEFAULT clause are 
      created in the statement memory root.
      
      
      mysql-test/r/ps.result:
        Test results has been fixed (Bug#14410)
      mysql-test/t/ps.test:
        A test case for Bug#14410 "Crash in Enum or Set type in CREATE 
        TABLE and PS/SP"
      sql/mysql_priv.h:
        typelib() function declaration has been changed.
      sql/sql_table.cc:
        Supply the statement memory root to use in typelib() and
        safe_charset_converter() functions to ensure that objects 
        created during the first execution of CREATE TABLE statement
        are allocated in persistent memory of the statement.
      sql/table.cc:
        Change typelib() function to require MEM_ROOT.
      2a1ae3a5
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6fb8a4e9
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      
      6fb8a4e9
    • unknown's avatar
      Updated expected error · e1af5e5d
      unknown authored
      e1af5e5d
  9. 24 Nov, 2005 4 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 44662d2c
      unknown authored
      into moonbone.local:/work/14482-bug-4.1-mysql
      
      
      44662d2c
    • unknown's avatar
      Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused · 3190b21f
      unknown authored
      crash
      
      resolve_const_item() substitutes item which will evaluate to constant with
      equvalent constant item, basing on the item's result type. In this case
      subselect was resolved as constant, and resolve_const_item() was substituting
      it's result's Item_caches to Item_null. Later Item_cache's function was called
      for Item_null object, which caused server crash.
      
      resolve_const_item() now substitutes constants for items with 
      result_type == ROW_RESULT only for Item_rows.
      
      
      sql/item.cc:
        Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
        crash
        
        resolve_const_item() now applies optimization for items with
        result_type == ROW_RESULT only to Item_rows.
      mysql-test/t/select.test:
        Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
      mysql-test/r/select.result:
        Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
      3190b21f
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · c3423d0d
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      c3423d0d
    • unknown's avatar
      Moved check of wrong schema version earlier · 102c0281
      unknown authored
      102c0281
  10. 23 Nov, 2005 1 commit
  11. 22 Nov, 2005 4 commits
  12. 21 Nov, 2005 6 commits
    • unknown's avatar
      Bug#10446 Illegal mix of collations: · 72d19611
      unknown authored
      item_strfunc.h, item_strfunc.cc, item.cc:
        Try to convert a const item into destination 
        character set. If conversion happens without
        data loss, then cache the converted value
        and return it during val_str().
        Otherwise, if conversion loses data, return
        Illeral mix of collations error, as it happened
        previously.
      ctype_recoding.result, ctype_recoding.test:
        Fixing tests accordingly.
      
      
      sql/item.cc:
        Bug#10446 Illegal mix of collations
        Try to convert a const item into destination 
        character set. If conversion happens without
        data loss, then cache the converted value
        and return it during val_str().
        Otherwise, if conversion loses data, return
        Illeral mix of collations error, as it happened
        previously.
      sql/item_strfunc.cc:
        Return cached value when it's possible.
      mysql-test/t/ctype_recoding.test:
        Fixing tests accordingly.
      mysql-test/r/ctype_recoding.result:
        Fixing tests accordingly.
      72d19611
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9f2a2b9a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      9f2a2b9a
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 749b747d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      749b747d
    • unknown's avatar
      Bug #14514 Creating table with packed key fails silently · 95b92b43
      unknown authored
       - Backport from 5.0
      
      
      include/my_base.h:
        Rename HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE, ie. it's a bit in the table_options variable
      mysql-test/r/ndb_basic.result:
        Add test result
      mysql-test/t/ndb_basic.test:
        Add test case for bug14514
      sql/ha_ndbcluster.cc:
        Use new bitmask for table_options to detect if create from engine
      sql/handler.cc:
        Use new bit for create from engine
      95b92b43
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1dfaaba8
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      
      1dfaaba8
  13. 19 Nov, 2005 2 commits
  14. 18 Nov, 2005 1 commit