1. 12 Jul, 2007 1 commit
    • unknown's avatar
      Bug#28158 - table->read_set is set incorrectly, · afbac007
      unknown authored
              causing wrong error message in Falcon
      
      An error message about a duplicate key could show a wrong key
      value when not all columns of the key were used to select the
      rows for update.
      
      Some storage engines return a record with only the selected
      columns filled.
      
      This is fixed by re-reading the record with a read_set which
      includes all columns of the duplicate key after a duplicate key
      error happens and before the error message is printed.
      
      
      mysql-test/r/ndb_update.result:
        Bug#28158 - table->read_set is set incorrectly,
                    causing wrong error message in Falcon
        Added test result.
      mysql-test/t/ndb_update.test:
        Bug#28158 - table->read_set is set incorrectly,
                    causing wrong error message in Falcon
        Added test from falcon_bug_28158.
      sql/sql_update.cc:
        Bug#28158 - table->read_set is set incorrectly,
                    causing wrong error message in Falcon
        Added a function for re-reading a record with a read_set
        that contains all fields used by a duplicate key.
        Called the function before every call to handler::print_error(),
        which could print a duplicate key value.
      afbac007
  2. 09 Jul, 2007 2 commits
  3. 08 Jul, 2007 13 commits
  4. 07 Jul, 2007 14 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 3561de50
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29417
      
      
      mysql-test/r/type_newdecimal.result:
        Manual merge.
      mysql-test/t/type_newdecimal.test:
        Manual merge.
      3561de50
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 7ec0820b
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      7ec0820b
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · cf682bad
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/include/mix1.inc:
        Merge with 5.0-opt.
      cf682bad
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · 79435f37
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      79435f37
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.1 · 5e25d08e
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      mysql-test/r/innodb_mysql.result:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      mysql-test/include/mix1.inc:
        Merge with 5.1 (main).
      5e25d08e
    • unknown's avatar
      Fixed bug #29417. · 0671e30a
      unknown authored
      An assertion abort could occur for some grouping queries that employed 
      decimal user variables with assignments to them.
      
      The problem appeared the constructors of the class Field_new_decimal
      because the function my_decimal_length_to_precision did not guarantee
      returning decimal precision not greater than DECIMAL_MAX_PRECISION.
      
      
      mysql-test/r/type_newdecimal.result:
        Added a test case for bug #29417.
      mysql-test/t/type_newdecimal.test:
        Added a test case for bug #29417.
      sql/field.cc:
        Fixed bug #29417.
        An assertion abort could occur for some grouping queries that employed 
        decimal user variables with assignments to them.
        
        The problem appeared the constructors of the class Field_new_decimal
        because the function my_decimal_length_to_precision did not guarantee
        returning decimal precision not greater than DECIMAL_MAX_PRECISION.
        
        Now if the precision returned by calls to my_decimal_length_to_precision
        in the constructors of the class Field_new_decimal is greater than 
        DECIMAL_MAX_PRECISION the precision is set to this value.
      0671e30a
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · 16fc3a27
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/t/innodb_mysql.test:
        Merge with 5.0 (main).
      16fc3a27
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1 · 95e4b2e3
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/4.1-opt
      
      
      95e4b2e3
    • unknown's avatar
      Fixed bug #29415. · 3756819e
      unknown authored
      The cast operation ignored the cases when the precision and/or the scale exceeded
      the limits, 65 and 30 respectively. No errors were reported in these cases.
      For some queries this may lead to an assertion abort.
      
      Fixed by throwing errors for such cases.
      
      
      mysql-test/r/type_newdecimal.result:
        Added a test case for bug #29415.
      mysql-test/t/type_newdecimal.test:
        Added a test case for bug #29415.
      3756819e
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 8c35eec8
      unknown authored
      into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
      
      
      8c35eec8
    • unknown's avatar
      fe00f78d
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · a0336ad7
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      mysql-test/t/loaddata.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/spatial.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/r/loaddata.result:
        Merge with 5.0-opt.
      mysql-test/t/view.test:
        Merge with 5.0-opt.
      a0336ad7
    • unknown's avatar
      Merge ymer.(none):/usr/local/mysql/mysql-5.0-engines · efbcbad4
      unknown authored
      into  ymer.(none):/usr/local/mysql/mysql-5.1-engines
      
      
      sql/stacktrace.c:
        Auto merged
      BUILD/compile-pentium-gcov:
        Manual merge.
      efbcbad4
    • unknown's avatar
      Bug #29543 GCov information not written in case of crash. · 87e1a302
      unknown authored
      For GCov builds, if the server crashes, the normal exit handler for writing
      coverage information is not executed due to the abnormal termination.
      
      Fix this by explicitly calling the __gcov_flush function in our crash handler.
      
      
      87e1a302
  5. 06 Jul, 2007 10 commits
    • unknown's avatar
      Merge... · 107d13e7
      unknown authored
      Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
      into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
      
      
      
      107d13e7
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1 · 84b9715d
      unknown authored
      into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
      
      
      libmysql/libmysql.c:
        Auto merged
      84b9715d
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · b1dce946
      unknown authored
      into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
      
      
      b1dce946
    • unknown's avatar
      Merge... · 6096d90e
      unknown authored
      Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
      into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
      
      
      mysql-test/t/fulltext2.test:
        Auto merged
      BitKeeper/deleted/.del-fulltext3.result:
        Delete: mysql-test/r/fulltext3.result
      BitKeeper/deleted/.del-fulltext3.test:
        Delete: mysql-test/t/fulltext3.test
      mysql-test/r/fulltext2.result:
        SCCS merged
      6096d90e
    • unknown's avatar
      fix test for bug29299 · a077186b
      unknown authored
      a077186b
    • unknown's avatar
      Merge... · db9a06b7
      unknown authored
      Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
      into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
      
      
      sql/sql_insert.cc:
        Auto merged
      db9a06b7
    • unknown's avatar
      Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines · 09ee3a5a
      unknown authored
      into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
      
      
      include/my_base.h:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/r/events_bugs.result:
        Auto merged
      mysql-test/r/rpl_sp.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/ndb_single_user.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      09ee3a5a
    • unknown's avatar
      Merge... · b0f65c16
      unknown authored
      Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-4.1-engines.merge
      into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
      
      
      
      b0f65c16
    • unknown's avatar
      Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines · fec6d3f1
      unknown authored
      into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
      
      
      sql/sql_insert.cc:
        Auto merged
      fec6d3f1
    • unknown's avatar
      Merge anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines · 46943ab6
      unknown authored
      into  anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines.merge
      
      
      46943ab6