1. 01 Jun, 2007 1 commit
    • unknown's avatar
      Bug #28477 innodb assertion and crash during alter table to add/drop partition. · e42439af
      unknown authored
      The bug was repeated on MyISAM tables, so isn't InnoDB specific.
      Reason of the bug is that partition-related members of TABLE_SHARE
      wasn't properly updated after ALTER command. So if other thread doesn't
      reread frm file, and just uses cached SHARE, it uses wrong data
      
      
      sql/sql_table.cc:
        Bug #28477 innodb assertion and crash during alter table to add/drop partition.
        
        keep share members updated after table modification
      sql/table.cc:
        Bug #28477 innodb assertion and crash during alter table to add/drop partition.
        
        share->partition_info_buffer_size initialization added
      sql/table.h:
        Bug #28477 innodb assertion and crash during alter table to add/drop partition.
        
        partition_info_buffer_size declared in st_table_share to store
        the size of the memory available for partition_info
      e42439af
  2. 23 May, 2007 2 commits
    • unknown's avatar
      sql_table.cc: · 2d6544b4
      unknown authored
        After merge fix.
      
      
      sql/sql_table.cc:
        After merge fix.
      2d6544b4
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt · 18580a32
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
      
      
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.h:
        Auto merged
      mysql-test/r/alter_table.result:
        Manual merge
      mysql-test/t/alter_table.test:
        Manual merge
      sql/sql_table.cc:
        Manual merge
      18580a32
  3. 22 May, 2007 6 commits
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f7f593ae
      unknown authored
      into  dl145s.mysql.com:/users/mhansson/mysql/autopush/mysql-5.0o-pushee
      
      
      sql/sql_select.cc:
        Auto merged
      f7f593ae
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B28476-5.0-opt · acd939c3
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B28476-5.1-opt
      
      Zero merge all except the new test
      
      
      mysql-test/r/key.result:
        bug #28476: zero-merge to 5.1
      mysql-test/r/myisam.result:
        bug #28476: merge to 5.1
      mysql-test/t/key.test:
        bug #28476: zero-merge to 5.1
      mysql-test/t/myisam.test:
        bug #28476: merge to 5.1
      sql/sql_base.cc:
        bug #28476: zero-merge to 5.1
      sql/sql_select.cc:
        bug #28476: zero-merge to 5.1
      sql/table.h:
        bug #28476: zero-merge to 5.1
      acd939c3
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 13cf5bdd
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28476-5.0-opt
      
      
      sql/sql_base.cc:
        Auto merged
      sql/table.h:
        Auto merged
      13cf5bdd
    • unknown's avatar
      Bug #28476: force index on a disabled myisam index gives error 124 · 3332b801
      unknown authored
      When processing the USE/FORCE index hints
      the optimizer was not checking if the indexes 
      specified are enabled (see ALTER TABLE).
      Fixed by:
       Backporting the fix for bug 20604 to 5.0
      
      
      mysql-test/r/key.result:
        Test for BUG 20604.
        The important part of the test is the explain output that 
        tests what indexes are used.
      mysql-test/r/myisam.result:
        Bug #28476: test cases
      mysql-test/t/key.test:
        Bug 20604: 
        The minimal test case that reveals the bug. The optimizer for 
        aggregates relies on keys disabled with ALTER TABLE ... DISABLE KEYS
        not being in the set TABLE::keys_in_use_for_query.
        When the execution engine tries to use a disabled index, MyISAM
        returns an error.
      mysql-test/t/myisam.test:
        Bug #28476: test cases
      sql/sql_base.cc:
        Bug #28476: 
         - Ignore disabled indexes in USE/FORCE index
      sql/sql_select.cc:
        Bug 20604 : The intersection operation between table->s->keys_in_use 
        and table->keys_in_use_for_query is no longer necessary.
        We can trust that the latter is a subset of the former.
      sql/table.h:
        Bug 20604:
        Added comments to TABLE_SHARE::keys_in_use and
        TABLE::keys_in_use_for_query.
      3332b801
    • unknown's avatar
      Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my50-bug23856 · 3c76d369
      unknown authored
      into  dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/mysql-5.0o-pushee
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Bug#23856: Manually merged
      mysql-test/t/func_gconcat.test:
        Bug#23856: Manually merged
      3c76d369
    • unknown's avatar
      Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my51-bug23856 · 6ae6d268
      unknown authored
      into  dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/mysql-5.1o-pushee
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Bug#23856: Manually merged test case.
      mysql-test/t/func_gconcat.test:
        Bug#23856: Manually merged test case.
      6ae6d268
  4. 21 May, 2007 20 commits
    • unknown's avatar
      14cb59d8
    • unknown's avatar
      Bug#27507: Wrong DATETIME value was allowed by ALTER TABLE in the NO_ZERO_DATE · f3b78f34
      unknown authored
      mode.
      
      When a new DATE/DATETIME field without default value is being added by the
      ALTER TABLE the '0000-00-00' value is used as the default one. But it wasn't
      checked whether such value was allowed by the set sql mode. Due to this
      '0000-00-00' values was allowed for DATE/DATETIME fields even in the
      NO_ZERO_DATE mode.
      
      Now the mysql_alter_table() function checks whether the '0000-00-00' value
      is allowed for DATE/DATETIME fields by the set sql mode.
      The new error_if_not_empty flag is used in the mysql_alter_table() function
      to indicate that it should abort if the table being altered isn't empty.
      The new new_datetime_field field is used in the mysql_alter_table() function
      for error throwing purposes. 
      The new error_if_not_empty parameter is added to the copy_data_between_tables()
      function to indicate the it should return error if the source table isn't empty.
      
      
      mysql-test/t/alter_table.test:
        Added a test case for the bug#27507: Wrong DATETIME value was allowed by
        ALTER TABLE in the NO_ZERO_DATE mode.
      mysql-test/r/alter_table.result:
        Added a test case for the bug#27507: Wrong DATETIME value was allowed by
        ALTER TABLE in the NO_ZERO_DATE mode.
      sql/sql_table.cc:
        Bug#27507: Wrong DATETIME value was allowed by ALTER TABLE in the NO_ZERO_DATE
        mode.
        Now the mysql_alter_table() function checks whether the '0000-00-00' value
        is allowed for DATE/DATETIME fields by the set sql mode.
        The new error_if_not_empty flag is used in the mysql_alter_table() function
        to indicate that it should abort if the table being altered isn't empty.
        The new new_datetime_field field is used in the mysql_alter_table() function
        for error throwing purposes. 
        The new error_if_not_empty parameter is added to the copy_data_between_tables()
        function to indicate the it should return error if the source table isn't empty.
      f3b78f34
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 1004132d
      unknown authored
      into  mysql.com:/home/hf/work/27984/my51-27984
      
      
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      1004132d
    • unknown's avatar
      Merge mysql.com:/home/hf/work/27984/my50-27984 · d50de104
      unknown authored
      into  mysql.com:/home/hf/work/27984/my51-27984
      
      
      mysql-test/t/type_newdecimal.test:
        Auto merged
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        merging
      d50de104
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bc31b650
      unknown authored
      into  mysql.com:/home/hf/work/27984/my50-27984
      
      
      bc31b650
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 741bbb75
      unknown authored
      into  mysql.com:/home/hf/work/27984/my50-27984
      
      
      mysql-test/r/type_newdecimal.result:
        merging
      mysql-test/t/type_newdecimal.test:
        merging
      741bbb75
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · 95b2152e
      unknown authored
      into  mysql.com:/home/hf/work/27984/my51-27984
      
      
      mysql-test/r/type_newdecimal.result:
        merging
      mysql-test/t/type_newdecimal.test:
        merging
      95b2152e
    • unknown's avatar
      Merge mysql.com:/home/hf/work/27984/my50-27984 · 32226588
      unknown authored
      into  mysql.com:/home/hf/work/27984/my51-27984
      
      
      mysql-test/t/type_newdecimal.test:
        Auto merged
      strings/decimal.c:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        merging
      32226588
    • unknown's avatar
      Bug #27984 Long Decimal Maths produces truncated results. · cfb9378b
      unknown authored
      decimal_round failed to perform a correct rounding 
      of a decimal number if its first nine digits were '9'.
      It just sets those digits to 0.
      
      
      mysql-test/r/type_newdecimal.result:
        Bug #27984 Long Decimal Maths produces truncated results.
        test result
      mysql-test/t/type_newdecimal.test:
        Bug #27984 Long Decimal Maths produces truncated results.
        test case
      strings/decimal.c:
        Bug #27984 Long Decimal Maths produces truncated results.
        when to == from we break the data if we do to->buf[0]=0
        So now doing this after the data is moved and only
        if we really need to set to->buf[0] to zero
      cfb9378b
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 00ed873c
      unknown authored
      into  mysql.com:/home/hf/work/28361/my50-28361
      
      
      00ed873c
    • unknown's avatar
      Merge mysql.com:/home/hf/work/28361/my50-28361 · fca620e6
      unknown authored
      into  mysql.com:/home/hf/work/28361/my51-28361
      
      
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      fca620e6
    • unknown's avatar
      test result fixed · 786adf87
      unknown authored
      786adf87
    • unknown's avatar
      Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my50-bug23856 · ab267d33
      unknown authored
      into  dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my51-bug23856
      
      
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/field.h:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/item_sum.cc:
        Bug#23856: Manual merge 5.0->5.1. Changed comparison to strict inequality between 
        convert_blob_length and UINT_MAX16. Replaced UINT_MAX16 with Field_varstring::MAX_SIZE.
      ab267d33
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · be043a5e
      unknown authored
      into  mysql.com:/home/hf/work/27894/my50-27894
      
      
      be043a5e
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 2a399133
      unknown authored
      into  mysql.com:/home/hf/work/27894/my51-27894
      
      
      2a399133
    • unknown's avatar
      bug#23856 · 84966af9
      unknown authored
      84966af9
    • unknown's avatar
      Merge mysql.com:/home/hf/work/27894/my50-27894 · 1983c507
      unknown authored
      into  mysql.com:/home/hf/work/27894/my51-27894
      
      
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      1983c507
    • unknown's avatar
      Bug #28361 Buffer overflow in DECIMAL code on Windows · d2c985e3
      unknown authored
      result max length changed for the 'decimal' fields
      so test results have to be fixed
      
      
      mysql-test/r/ps_2myisam.result:
        Bug #28361 Buffer overflow in DECIMAL code on Windows 
        test result fixed
      mysql-test/r/ps_3innodb.result:
        Bug #28361 Buffer overflow in DECIMAL code on Windows 
        test result fixed
      mysql-test/r/ps_4heap.result:
        Bug #28361 Buffer overflow in DECIMAL code on Windows 
        test result fixed
      mysql-test/r/ps_5merge.result:
        Bug #28361 Buffer overflow in DECIMAL code on Windows 
        test result fixed
      mysql-test/r/ps_7ndb.result:
        Bug #28361 Buffer overflow in DECIMAL code on Windows 
        test result fixed
      d2c985e3
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B22855-5.0-opt · 4b4823be
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B22855-5.1-opt
      
      
      mysql-test/r/subselect3.result:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      4b4823be
    • unknown's avatar
      Merge macbook:mysql/work/B22855-5.0-opt · 330a82f0
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B22855-5.0-opt
      
      
      sql/item_subselect.cc:
        Auto merged
      mysql-test/r/subselect3.result:
        manual merge
      mysql-test/t/subselect3.test:
        manual merge
      330a82f0
  5. 20 May, 2007 2 commits
    • unknown's avatar
      Merge mysql.com:/home/hf/work/28361/my50-28361 · 2626eabc
      unknown authored
      into  mysql.com:/home/hf/work/28361/my51-28361
      
      
      mysql-test/t/type_newdecimal.test:
        Auto merged
      sql/my_decimal.h:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        merging
      2626eabc
    • unknown's avatar
      bug #28361 Buffer overflow in DECIMAL code on Windows · 59a7e066
      unknown authored
      my_decimal in some cases can contain more decimal digits than
      is officially supported (DECIMAL_MAX_PRECISION), so we need to
      prepare bigger buffer for the resulting string.
      
      
      mysql-test/r/type_newdecimal.result:
        bug #28361 Buffer overflow in DECIMAL code on Windows
        test result
      mysql-test/t/type_newdecimal.test:
        bug #28361 Buffer overflow in DECIMAL code on Windows
        test case
        This test case doesn't fall in most cases even without the fix
        Still valgrind shows the problemn
      sql/my_decimal.h:
        bug #28361 Buffer overflow in DECIMAL code on Windows
        DECIMAL_MAX_POSSIBLE_PRECISION introduced to be used in places,
        when we need to check for the number of digits technicaly possible
        in my_decimal.
        DECIMAL_MAX_STR_LENGTH fixed as it has to fit for the MAX_POSSIBLE_PRECISION
      59a7e066
  6. 18 May, 2007 9 commits
    • unknown's avatar
      merging · 5d207593
      unknown authored
      5d207593
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 7786aca7
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      sql/item.cc:
        Auto merged
      mysql-test/r/sp_trans.result:
        merging
      mysql-test/t/sp_trans.test:
        merging
      7786aca7
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 8b33c415
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      8b33c415
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8933c18c
      unknown authored
      into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      8933c18c
    • unknown's avatar
      added cleanup to some tests · f7434c4f
      unknown authored
      
      mysql-test/r/sp_trans.result:
        added cleanup
      mysql-test/r/strict.result:
        added cleanup
      mysql-test/t/sp_trans.test:
        added cleanup
      mysql-test/t/strict.test:
        added cleanup
      f7434c4f
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · d3b45513
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      d3b45513
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1 · f0abfddf
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      f0abfddf
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · 5f66ebe8
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      5f66ebe8
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · caf045db
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      caf045db