1. 03 Nov, 2005 27 commits
    • unknown's avatar
      Fixes during review of new code · 52a992d5
      unknown authored
      Destroy LOCK_uuid_generator
      
      
      sql/ha_berkeley.h:
        Fix portability problem (warnings from gcc on 32 bit linux)
      sql/ha_ndbcluster.cc:
        Fixed portability problem
      sql/mysqld.cc:
        Destroy LOCK_uuid_generator
      52a992d5
    • unknown's avatar
      test enabled · c701043d
      unknown authored
      c701043d
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 24e66a86
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.9551
      
      
      BitKeeper/deleted/.del-ctype_cp932.result:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932.test:
        Auto merged
      24e66a86
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 03d3141f
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.9551
      
      
      sql/sql_select.cc:
        Auto merged
      03d3141f
    • unknown's avatar
      Disabled a test temporarily. · a7662e64
      unknown authored
      a7662e64
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2928d1df
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
      
      2928d1df
    • unknown's avatar
      opt_range.cc: · 37420b37
      unknown authored
        Additional fix for bug#14093
      
      
      sql/opt_range.cc:
        Additional fix for bug#14093
      37420b37
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 68e29848
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
      
      68e29848
    • unknown's avatar
      Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 · 3012746a
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932.result:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932.test:
        Auto merged
      Makefile.am:
        Merged from 4.1
      3012746a
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 60678828
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
      
      60678828
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 995ba7e6
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-14210
      
      
      sql/handler.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      995ba7e6
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 9e468584
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.9551
      
      9e468584
    • unknown's avatar
      Merging · 921a0649
      unknown authored
      
      mysql-test/r/ctype_cp932_binlog.result:
        test result fixed
      mysql-test/t/ctype_cp932_binlog.test:
        test fixed with 5.0 specific
      921a0649
    • unknown's avatar
      A fix and a test case for Bug#14210 "Simple query with > operator on · e76aef36
      unknown authored
      large table gives server crash": make sure that when a MyISAM temporary
      table is created for a cursor, it's created in its memory root,
      not the memory root of the current query.
      
      
      mysql-test/r/sp.result:
        Test results fixed: a test case for Bug#14210
      mysql-test/t/sp.test:
        A test case for Bug#14210 "Simple query with > operator on large table 
        gives server crash"
      sql/handler.cc:
        - rewrite get_new_handler to accept a memory root and use it for
      sql/handler.h:
        - get_new_handler declaration changed
      sql/opt_range.cc:
        - get_new_handler declaration changed
      sql/sql_base.cc:
        - get_new_handler declaration changed
      sql/sql_select.cc:
        - the actual fix for Bug#14210. In create_myisam_from_heap we should
        create the new table handler in TABLE::mem_root, not in THD::mem_root:
        the latter is freed shortly after cursor is open.
        - adjust create_tmp_table to explicitly supply &table->mem_root
        to get_new_handler when creating a handler for a new temporary table
      sql/sql_table.cc:
        - get_new_handler declaration changed
      sql/table.cc:
        - get_new_handler declaration changed
      sql/unireg.cc:
        - get_new_handler declaration changed
      tests/mysql_client_test.c:
        A test case for Bug#14210 "Simple query with > operator on large table
         gives server crash": a C API test case is worth adding because of different
        memory allocation/freeing patterns in handling of C API and SP cursors
      e76aef36
    • unknown's avatar
      Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 · e515af86
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
      
      
      Makefile.am:
        Merged from 4.0
      mysql-test/mysql-test-run.sh:
        Merged from 4.0
      e515af86
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-4.1.14183 · 84255dbe
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.9551
      
      
      BitKeeper/deleted/.del-ctype_cp932.result:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932.test:
        Auto merged
      84255dbe
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0f69754c
      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
      0f69754c
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 88c61a9b
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.9551
      
      
      sql/sql_select.cc:
        Auto merged
      88c61a9b
    • unknown's avatar
      Fix bug #14093 Query takes a lot of time when date format is not valid · 898f6f28
      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
      898f6f28
    • unknown's avatar
      Added test-force to Makefile. · ff74f85a
      unknown authored
      ff74f85a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a9b90334
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      a9b90334
    • unknown's avatar
      Added new build script for pentium64. · effa48a3
      unknown authored
      effa48a3
    • unknown's avatar
      4792bd88
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · d8d016e8
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
      
      d8d016e8
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · 5324102d
      unknown authored
      into mysql.com:/home/hf/work/mysql-4.1.14183
      
      5324102d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f3fd5450
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      f3fd5450
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 81eb2c2e
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.13573
      
      
      sql/item_func.cc:
        Auto merged
      81eb2c2e
  2. 02 Nov, 2005 13 commits