1. 03 Nov, 2005 10 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 46865aae
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-oct03-push
      
      
      46865aae
    • unknown's avatar
      Merge mysql.com:/home/psergey/mysql-5.0-bug14026-r2 · 4d155f06
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-oct03-push
      
      
      mysql-test/r/join_nested.result:
        Auto merged
      mysql-test/t/join_nested.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/table.h:
        Auto merged
      4d155f06
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · dd490fd2
      unknown authored
      into moonbone.local:/work/14093-bug-5.0-mysql
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/item.h:
        Auto merged
      dd490fd2
    • unknown's avatar
      Fix bug #14093 Query takes a lot of time when date format is not valid · bb841518
      unknown authored
      Invalid date like 2000-02-32 wasn't converted to int, which lead to not
      using index and comparison with field as astring, which results in slow
      query execution.
      
      convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
      allow such conversion.
      
      
      sql/item.h:
        Fix bug #14093 Query takes a lot of time when date format is not valid
        To Item_int_with_ref added method real_item() which returns ref.
      sql/item_cmpfunc.cc:
         Fix bug #14093 Query takes a lot of time when date format is not valid
        convert_constant_item() now allows conversion of invalid dates like 2000-01-32 to int to make it possible to use index when comparing fields with such dates.
      sql/opt_range.cc:
         Fix bug #14093 Query takes a lot of time when date format is not valid
        get_mm_leaf() modified so it allows index usage for comparing fields with invalid dates like 2000-01-32.
      mysql-test/r/select.result:
        Test case for bug#14093 Query takes a lot of time when date format is not valid
      mysql-test/t/select.test:
        Test case for bug#14093 Query takes a lot of time when date format is not valid
      bb841518
    • unknown's avatar
      Post-merge fixes · a7956c81
      unknown authored
      a7956c81
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 096f181d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      096f181d
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · aa647c9b
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug14026-r2
      
      
      aa647c9b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4f1a5591
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      4f1a5591
    • unknown's avatar
      Merged · 883b38a2
      unknown authored
      883b38a2
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 4d65081c
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.13573
      
      
      sql/item_func.cc:
        Auto merged
      4d65081c
  2. 02 Nov, 2005 30 commits