1. 11 Jul, 2007 5 commits
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/autopush/B29325-5.0-opt · ecbd9efe
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B29325-merge-5.1-opt
      
      
      client/mysql.cc:
        Auto merged
      include/my_base.h:
        Auto merged
      mysql-test/r/ctype_collate.result:
        Auto merged
      mysql-test/r/gis-rtree.result:
        Auto merged
      mysql-test/t/gis-rtree.test:
        Auto merged
      storage/myisam/mi_create.c:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      mysys/my_conio.c:
        5.0-opt -> 5.1.-opt merge
      storage/myisam/sp_key.c:
        5.0-opt -> 5.1.-opt merge
      ecbd9efe
    • unknown's avatar
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 2b1fb350
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B29325-5.0-opt
      
      
      include/my_base.h:
        Auto merged
      2b1fb350
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B29325-5.0-opt · 2ca32b76
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B29325-5.1-opt
      
      
      include/my_base.h:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/mi_create.c:
        Auto merged
      mysql-test/r/create.result:
        5.0-opt -> 5.1-opt merge
      sql/set_var.cc:
        5.0-opt -> 5.1-opt merge
      sql/sql_class.h:
        5.0-opt -> 5.1-opt merge
      sql/sql_table.cc:
        5.0-opt -> 5.1-opt merge
      sql/unireg.cc:
        5.0-opt -> 5.1-opt merge
      2ca32b76
    • unknown's avatar
      Bug #29325: · 1abab6c7
      unknown authored
      By default MyISAM overwrites .MYD and .MYI files no 
      DATA DIRECTORY option is used. This can lead to two tables
      using the same .MYD and .MYI files (that can't be dropped).
      
      To prevent CREATE TABLE from overwriting a file a new option
      is introduced : keep_files_on_create
      When this is on the CREATE TABLE throws an error if either
      the .MYD or .MYI exists for a MyISAM table.
      The option is off by default (resulting in compatible behavior).
      
      
      include/my_base.h:
        Bug #29325: introduce keep_files_on_create
      myisam/mi_create.c:
        Bug #29325: introduce keep_files_on_create
      mysql-test/r/create.result:
        Bug #29325: test case
      mysql-test/t/create.test:
        Bug #29325: test case
      sql/ha_myisam.cc:
        Bug #29325: introduce keep_files_on_create
      sql/set_var.cc:
        Bug #29325: introduce keep_files_on_create
      sql/sql_class.h:
        Bug #29325: introduce keep_files_on_create
      sql/sql_table.cc:
        Bug #29325: introduce keep_files_on_create
      sql/unireg.cc:
        Bug #29325: introduce keep_files_on_create
      1abab6c7
  2. 10 Jul, 2007 3 commits
  3. 09 Jul, 2007 1 commit
    • unknown's avatar
      Bug #29070: Error in spatial index · 2ad26498
      unknown authored
      1. Threat MBR for a key as double[] and convert it only
      when about to store it on disk.
      2. Remove the redundant function get_double().
      
      
      myisam/sp_key.c:
        Bug #29070: 
        1. threat MBR for a key as double[] and convert it only
        when about to store it on disk.
        2. remove the redundant function get_double()
      mysql-test/r/gis-rtree.result:
        Bug #29070: test case
      mysql-test/t/gis-rtree.test:
        Bug #29070: test case
      2ad26498
  4. 08 Jul, 2007 9 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 25cba450
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/29461-bug-5.0-opt-mysql
      
      
      25cba450
    • unknown's avatar
      Bug#29461: Sort order of the collation wasn't used when comparing characters · bfa027e7
      unknown authored
      with the space character.
      
      When the my_strnncollsp_simple function compares two strings and one is a prefix
      of another then this function compares characters in the rest of longer key
      with the space character to find whether the longer key is greater or less.
      But the sort order of the collation isn't used in this comparison. This may
      lead to a wrong comparison result, wrongly created index or wrong order of the
      result set of a query with the ORDER BY clause.
      
      Now the my_strnncollsp_simple function uses collation sort order to compare
      the characters in the rest of longer key with the space character.
      
      
      mysql-test/t/ctype_collate.test:
        Added a test case for the bug#29461: Sort order of the collation wasn't used when
        comparing characters with the space character.
      mysql-test/r/ctype_collate.result:
        Added a test case for the bug#29461: Sort order of the collation wasn't used when
        comparing characters with the space character.
      strings/ctype-simple.c:
        Bug#29461: Sort order of the collation wasn't used when comparing characters
        with the space character.Now the my_strnncollsp_simple function uses collation sort order to compare
        the characters in the rest of longer key with the space character.
      bfa027e7
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 33e556ff
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/29310-bug-5.1-opt-mysql
      
      
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      33e556ff
    • unknown's avatar
      Bug#29310: An InnoDB table was updated when the data wasn't actually changed. · a68a457b
      unknown authored
      When a table is being updated it has two set of fields - fields required for
      checks of conditions and fields to be updated. A storage engine is allowed
      not to retrieve columns marked for update. Due to this fact records can't
      be compared to see whether the data has been changed or not. This makes the
      server always update records independently of data change.
      
      Now when an auto-updatable timestamp field is present and server sees that
      a table handle isn't going to retrieve write-only fields then all of such
      fields are marked as to be read to force the handler to retrieve them.
      
      
      mysql-test/r/innodb_mysql.result:
        Added a test case for the bug#29310: An InnoDB table was updated when the data wasn't actually changed.
      mysql-test/include/mix1.inc:
        Added a test case for the bug#29310: An InnoDB table was updated when the data wasn't actually changed.
      sql/sql_update.cc:
        Bug#29310: An InnoDB table was updated when the data wasn't actually changed.
        Now the mysql_update function when an auto-updatable timestamp field is
        present marks write-only fields as to be read to force the table handler
        to retrieve them.
      sql/sql_insert.cc:
        Bug#29310: An InnoDB table was updated when the data wasn't actually changed.
        Now the write_record function can compare records when fileds to be written is
        a subset of the fields to be read while updating a record.
      a68a457b
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 22881bfb
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      22881bfb
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 36896fa8
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      sql/field.cc:
        Auto merged
      36896fa8
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f045039d
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      f045039d
    • unknown's avatar
      Post-merge fix. · f8186547
      unknown authored
      f8186547
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 2e5be55a
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
      
      
      sql/field.cc:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        Manual merge
      sql/item_create.cc:
        Manual merge
      mysql-test/t/type_newdecimal.test:
        Manual merge.
      2e5be55a
  5. 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
  6. 06 Jul, 2007 8 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