1. 25 Apr, 2006 1 commit
    • unknown's avatar
      BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes · 15e00f1f
      unknown authored
      too much memory. Instead, either create the equvalent SEL_TREE manually, or create only two ranges that
      strictly include the area to scan
      (Note: just to re-iterate: increasing NOT_IN_IGNORE_THRESHOLD will make optimization run slower for big 
      IN-lists, but the server will not run out of memory. O(N^2) memory use has been eliminated)
      
      
      mysql-test/r/func_in.result:
        Testcase for BUG#15872
      mysql-test/t/func_in.test:
        Testcase for BUG#15872
      sql/item.cc:
        BUG#15872: Added Item_decimal::set_decimal_value()
      sql/item.h:
        UG#15872: Added Item_decimal::set_decimal_value()
      sql/item_cmpfunc.h:
        BUG#15872: Added in_vector::create_item(), in_vector::value_to_item() and their implementations in concrete
        classes.
      sql/opt_range.cc:
        BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that 
        consumes too much memory. Instead, either 
         A) create the equivalent SEL_TREE manually, making use of the fact that item_not_in->array
            has an ordered IN-list, or
         B) create only two ranges: (-inf|NULL) < X < min_value_from_in_list,  max_value_from_in_list < X
        (Choose #B if the IN-list has > 10K elements)
      15e00f1f
  2. 24 Apr, 2006 4 commits
  3. 23 Apr, 2006 11 commits
    • unknown's avatar
      Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 · 61ccffb3
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
      
      
      sql/sql_base.cc:
        manual merge use local
      61ccffb3
    • unknown's avatar
      Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/5.0-bug17263-temp_drop · d1e1f4f7
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
      
      
      mysql-test/r/rpl_temporary.result:
        Auto merged
      mysql-test/t/rpl_temporary.test:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      d1e1f4f7
    • unknown's avatar
      Bug#17263 temporary tables and replication · 65cce20c
      unknown authored
      The fix refines the algorithm of generating DROPs for binlog. 
      Temp tables with common pseudo_thread_id are clustered into one query. 
      Consequently one replication event per pseudo_thread_id is generated.
      
      
      mysql-test/r/rpl_temporary.result:
        results
      mysql-test/t/rpl_temporary.test:
        Creating temp tables associated with a set of pseudo_thread_id values within a connection.
        The aim is to see that slave digest master's binlog consisting of DROP temprorary tables.
      sql/sql_base.cc:
        close_temporary_tables is rewritten to generate sequence of DROP temprorary tables with common preudo_thread_id stored in temp table definition.
      65cce20c
    • unknown's avatar
      Bug#17263: incorrect DROP query in temporary tables replication · 4189bfa4
      unknown authored
      accounting non-ai32 in tmpkeyval. This changeset is supposed to be specifically for 4.1.
      Another changeset is going to push into 5. 
      
      
      sql/sql_base.cc:
        correction due to uint4korr definition: can not sizeof on not ia32.
      4189bfa4
    • unknown's avatar
      manual merge use local · c80bff65
      unknown authored
      c80bff65
    • unknown's avatar
      Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 · a9edb4b3
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
      
      
      mysql-test/r/rpl_temporary.result:
        manual merge use local
      a9edb4b3
    • unknown's avatar
      Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 · e0ebbf67
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
      
      
      mysql-test/t/func_compress.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      e0ebbf67
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-5.0-root · 8e28ab1f
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      8e28ab1f
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · dc796fce
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0
      
      
      mysql-test/r/innodb.result:
        SCCS merged
      mysql-test/t/innodb.test:
        SCCS merged
      dc796fce
    • unknown's avatar
      Bug#17263 temporary tables and replication · 329ebbd1
      unknown authored
        Backporting a changeset made for 5.0. Comments from there:
      
        The fix refines the algorithm of generating DROPs for binlog.
        Temp tables with common pseudo_thread_id are clustered into one query.
        Consequently one replication event per pseudo_thread_id is generated.
      
      
      
      
      mysql-test/r/rpl_temporary.result:
        results changed
      mysql-test/t/rpl_temporary.test:
        test to generate problematic drop in binlog to feed it to restarting slave
        to see no stop.
      sql/sql_base.cc:
        change in drop temprorary tables alg in close_temporary_tables.
      329ebbd1
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8ed06b84
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-4.1
      
      
      8ed06b84
  4. 22 Apr, 2006 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 2efefe68
      unknown authored
      into  mysql.com:/home/dlenev/mysql-5.0-bg15153-2
      
      
      2efefe68
    • unknown's avatar
      Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs". · dc526db8
      unknown authored
      Error was emitted when one tried to select information from view which used
      merge algorithm and which also had CONVERT_TZ() function in its select list.
      
      This bug was caused by wrong assumption that global table list for view
      which is handled using merge algorithm begins from tables belonging to
      the main select of this view. Nowadays the above assumption is not true only
      when one uses convert_tz() function in view's select list, but in future
      other cases may be added (for example we may support merging of views
      with subqueries in select list one day). Relying on this false assumption
      led to the usage of wrong table list for field lookups and therefor errors. 
      
      With this fix we explicitly use pointer to the beginning of main select's
      table list.
      
      
      mysql-test/r/timezone_grant.result:
        Added additional test case for bug#15153 "CONVERT_TZ() is not allowed in
        all places in VIEWs" that checks that usage of CONVERT_TZ() function in view
        does not require additional privileges.
      mysql-test/r/view.result:
        Added test case for bug#15153 "CONVERT_TZ() is not allowed in all places in 
        VIEWs".
      mysql-test/t/timezone_grant.test:
        Added additional test case for bug#15153 "CONVERT_TZ() is not allowed in
        all places in VIEWs" that checks that usage of CONVERT_TZ() function in view
        does not require additional privileges.
      mysql-test/t/view.test:
        Added test case for bug#15153 "CONVERT_TZ() is not allowed in all places in 
        VIEWs".
      sql/sql_view.cc:
        mysql_make_view():
          We should not assume that global table list for view which is handled using
          merge algorithm begins from tables belonging to the main select of this
          view. Nowadays the above assumption is not true only when one uses
          convert_tz() function in view's select list, but in future other cases
          may be added (for example we may support merging of views with subqueries
          in select list one day). So let us instead explicitly use pointer to the
          beginning of main select's table list.
      dc526db8
  5. 21 Apr, 2006 20 commits
  6. 20 Apr, 2006 2 commits
    • unknown's avatar
      Restoring changes erroneously removed by applying · 43690501
      unknown authored
       the innodb-5.0-ss476 snapshot.
      
      
      43690501
    • unknown's avatar
      Applied innodb-5.0-ss476 snapshot. · 7ee05d7c
      unknown authored
       Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
       Also, fix memory leaks in row_create_table_for_mysql() in rare
       corner cases.
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      innobase/dict/dict0load.c:
        Applied innodb-5.0-ss476 snapshot.
         dict_load_table(): Refuse to load tables with other TYPE
         than DICT_TABLE_ORDINARY.
      innobase/dict/dict0mem.c:
        Applied innodb-5.0-ss476 snapshot.
         Add dict_mem_table_free(), use it instead of duplicating
         the code everywhere.
      innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.0-ss476 snapshot.
      innobase/include/dict0dict.h:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column name (Bug#18934).
      innobase/include/dict0mem.h:
        Applied innodb-5.0-ss476 snapshot.
         Add dict_mem_table_free(), use it instead of duplicating
         the code everywhere.
      innobase/include/univ.i:
        Applied innodb-5.0-ss476 snapshot.
      innobase/log/log0recv.c:
        Applied innodb-5.0-ss476 snapshot.
      innobase/row/row0mysql.c:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      mysql-test/r/innodb.result:
        Applied innodb-5.0-ss476 snapshot.
         Fix result for test case for Bug#18934.
         (Other changes are to be restored by the next cset).
      mysql-test/t/innodb.test:
        Applied innodb-5.0-ss476 snapshot.
         Fix result for test case for Bug#18934.
         (Removed test case for Bug#14360 is to be restored by the next cset).
      7ee05d7c