1. 09 Oct, 2007 1 commit
  2. 08 Oct, 2007 2 commits
    • unknown's avatar
      Fixed bug #31310. · b9805a5a
      unknown authored
      Locked rows of the InnoDB storage was silently skipped in the read-committed
      isolation level.
      
      QUICK_RANGE_SELECT for unique ranges lacks second (blocking) read
      of the record that was read semi-consistently and just skip it.
      
      The handler::read_multi_range_next method has been modified
      to retry previous unique range if the previous read was
      semi-consistent.
      
      
      sql/handler.cc:
        Fixed bug #31310.
        The handler::read_multi_range_next method has been modified
        to retry previous unique range if the previous read was
        semi-consistent.
      mysql-test/include/mix1.inc:
        Added test case for bug #31310.
      mysql-test/r/innodb_mysql.result:
        Added test case for bug #31310.
      b9805a5a
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · 3867aed6
      unknown authored
      into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
      
      
      3867aed6
  3. 06 Oct, 2007 1 commit
  4. 05 Oct, 2007 18 commits
    • unknown's avatar
      Bug #31094: Forcing index-based sort doesn't work anymore if joins are done · 10cde5e4
      unknown authored
      A rule was introduced by the 5.1 part of the fix for bug 27531 to 
      prefer filesort over indexed ORDER BY when accessing all of the rows of a 
      table (because it's faster). This new rule was not accounting for the 
      presence of a LIMIT clause.
      Fixed the condition for this rule so it will prefer filesort over 
      indexed ORDER BY only if no LIMIT.
      
      
      mysql-test/r/compress.result:
        Bug #31094: LIMIT is not considered a full index scan
      mysql-test/r/join.result:
        Bug #31094: test case
      mysql-test/r/select.result:
        Bug #31094: LIMIT is not considered a full index scan
      mysql-test/r/ssl.result:
        Bug #31094: LIMIT is not considered a full index scan
      mysql-test/r/ssl_compress.result:
        Bug #31094: LIMIT is not considered a full index scan
      mysql-test/t/join.test:
        Bug #31094: test case
      sql/sql_select.cc:
        Bug #31094: prefer filesort over indexed ORDER BY only if no LIMIT
      10cde5e4
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 645e6989
      unknown authored
      into  mysql.com:/home/hf/work/30286/my51-30286
      
      
      645e6989
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · adab28eb
      unknown authored
      into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
      
      
      adab28eb
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30286/my50-30286 · 177d3c3c
      unknown authored
      into  mysql.com:/home/hf/work/30286/my51-30286
      
      
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      177d3c3c
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30286/my41-30286 · 071e55af
      unknown authored
      into  mysql.com:/home/hf/work/30286/my50-30286
      
      
      mysql-test/t/gis.test:
        Auto merged
      sql/gstream.cc:
        Auto merged
      mysql-test/r/gis.result:
        SCCS merged
      071e55af
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30955/my41-30955 · 77d786b5
      unknown authored
      into  mysql.com:/home/hf/work/30286/my41-30286
      
      
      77d786b5
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30286/my50-30286 · 581bfa3d
      unknown authored
      into  mysql.com:/home/hf/work/30286/my51-30286
      
      
      581bfa3d
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30286/my41-30286 · c7aff982
      unknown authored
      into  mysql.com:/home/hf/work/30286/my50-30286
      
      
      c7aff982
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30286/my41-30286 · ea283365
      unknown authored
      into  mysql.com:/home/hf/work/30286/my51-30286
      
      
      ea283365
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1-opt · c14e8c80
      unknown authored
      into  mysql.com:/home/hf/work/30286/my41-30286
      
      
      c14e8c80
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 794ed298
      unknown authored
      into  mysql.com:/home/hf/work/30286/my50-30286
      
      
      794ed298
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · 33b93d80
      unknown authored
      into  mysql.com:/home/hf/work/30286/my51-30286
      
      
      33b93d80
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30286/my50-30286 · 8d7371a6
      unknown authored
      into  mysql.com:/home/hf/work/30286/my51-30286
      
      
      mysql-test/r/gis-rtree.result:
        Auto merged
      mysql-test/t/gis-rtree.test:
        Auto merged
      storage/myisam/rt_index.c:
        Auto merged
      storage/myisam/rt_mbr.c:
        Auto merged
      8d7371a6
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30286/my41-30286 · 8e374815
      unknown authored
      into  mysql.com:/home/hf/work/30286/my50-30286
      
      
      myisam/rt_index.c:
        Auto merged
      myisam/rt_mbr.c:
        Auto merged
      mysql-test/t/gis-rtree.test:
        Auto merged
      mysql-test/r/gis-rtree.result:
        merging
      8e374815
    • unknown's avatar
      Bug #30286 spatial index cause corruption and server crash! · 6d54b577
      unknown authored
      As the result of DOUBLE claculations can be bigger
      than DBL_MAX constant we use in code, we shouldn't use this constatn
      as a biggest possible value.
      Particularly the rtree_pick_key function set 'min_area= DBL_MAX' relying
      that any rtree_area_increase result will be less so we return valid
      key. Though in rtree_area_increase function we calculate the area
      of the rectangle, so the result can be 'inf' if the rectangle is
      huge enough, which is bigger than DBL_MAX.
      
      Code of the rtree_pick_key modified so we always return a valid key.
      
      
      myisam/rt_index.c:
        Bug #30286 spatial index cause corruption and server crash!
        
        always set the best_key with the first key we get, so we always return
        somthing valid.
      myisam/rt_mbr.c:
        Bug #30286 spatial index cause corruption and server crash!
        
        function comment extended
      mysql-test/r/gis-rtree.result:
        Bug #30286 spatial index cause corruption and server crash!
        test result
      mysql-test/t/gis-rtree.test:
        Bug #30286 spatial index cause corruption and server crash!
        test case
      6d54b577
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · 9d87e8f8
      unknown authored
      into  mysql.com:/home/hf/work/26527/my51-26527
      
      
      sql/ha_partition.cc:
        Auto merged
      9d87e8f8
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 7e5f4fe2
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      mysql-test/r/information_schema.result:
        manual merge
      mysql-test/t/information_schema.test:
        manual merge
      7e5f4fe2
    • unknown's avatar
      test fix(to satisfy WIN) · 554d405d
      unknown authored
      
      mysql-test/r/information_schema.result:
        result fix
      554d405d
  5. 04 Oct, 2007 10 commits
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · 9f4a5928
      unknown authored
      into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
      
      
      9f4a5928
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · f2302e55
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/func_math.result:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/func_math.test:
        Auto merged
      mysql-test/t/func_misc.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      client/client_priv.h:
        manual merge
      f2302e55
    • unknown's avatar
      after merge fix · fca5cbe6
      unknown authored
      fca5cbe6
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · 68f4fab0
      unknown authored
      into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
      
      
      sql/item_timefunc.h:
        Auto merged
      68f4fab0
    • unknown's avatar
      manual merge · 0de3ea72
      unknown authored
      0de3ea72
    • unknown's avatar
      Bug#30079 A check for "hidden" I_S tables is flawed · 4ae273e3
      unknown authored
      added check for hidden I_S tables for 'show columns|keys' commands
      
      
      mysql-test/r/information_schema.result:
        test result
      mysql-test/t/information_schema.test:
        test case
      sql/sql_parse.cc:
        added check for hidden I_S tables for 'show columns|keys' commands
      4ae273e3
    • unknown's avatar
      after merge fix · fdf3c175
      unknown authored
      fdf3c175
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 4e15adf8
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/func_math.result:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/t/func_math.test:
        Auto merged
      mysql-test/t/func_misc.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      client/client_priv.h:
        manual merge
      mysql-test/r/mysqldump.result:
        manual merge
      mysql-test/r/view_grant.result:
        manual merge
      sql/field.cc:
        manual merge
      sql/sql_select.cc:
        manual merge
      tests/mysql_client_test.c:
        manual merge
      4e15adf8
    • unknown's avatar
      Merge linux-st28.site:/home/martin/mysql/src/bug30942/my50-bug30942 · f7bf6318
      unknown authored
      into  linux-st28.site:/home/martin/mysql/src/bug30942/my51-bug30942
      
      
      sql/item_timefunc.h:
        Auto merged
      mysql-test/r/type_date.result:
        Bug#30942: Manual merge
      mysql-test/t/type_date.test:
        Bug#30942: Manual merge
      f7bf6318
    • unknown's avatar
      Bug #30942: select str_to_date from derived table returns varying results · f8f021fd
      unknown authored
      The function str_to_date has a field to say whether it's invoked constant 
      arguments. But this member was not initialized, causing the function to
      think that it could use a cache of the format type when said cache was in 
      fact not initialized.
      Fixed by initializing the field to false.
      
      
      mysql-test/r/type_date.result:
        Bug#30942: Test result
      mysql-test/t/type_date.test:
        Bug#30942: Test case
      sql/item_timefunc.h:
        Bug#30942: Initialized const_item to false
      f8f021fd
  6. 03 Oct, 2007 5 commits
    • unknown's avatar
      mysqldump.c: · 6356f161
      unknown authored
        Post-merge fix.
      
      
      client/mysqldump.c:
        Post-merge fix.
      6356f161
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077 · c1548d74
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      client/client_priv.h:
        Merge with 5.0-opt.
      mysql-test/r/mysqldump.result:
        Merge with 5.0-opt.
      c1548d74
    • unknown's avatar
      Bug #30955 geomfromtext() crasher. · ae3d4bfc
      unknown authored
      end-of-line check missed in Gis_read_stream::get_next_word,
      what can lead to crashes (expecially with NULL strings).
      
      End-of-line check added
      
      
      sql/gstream.cc:
        Bug #30955 geomfromtext() crasher
      mysql-test/r/gis.result:
        Bug #30955 geomfromtext() crasher.
        
        test result
      mysql-test/t/gis.test:
        Bug #30955 geomfromtext() crasher.
        
        test case
      ae3d4bfc
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077 · a408f348
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      a408f348
    • unknown's avatar
      mysqldump.test, mysqldump.result: · b802af43
      unknown authored
        Bug #31077: post-commit fix.
      
      
      mysql-test/t/mysqldump.test:
        Bug #31077: post-commit fix.
      mysql-test/r/mysqldump.result:
        Bug #31077: post-commit fix.
      b802af43
  7. 02 Oct, 2007 3 commits