1. 22 Aug, 2007 8 commits
    • unknown's avatar
      Bug#30333 (Performance, expressions lists in the parser) · 5dc3e889
      unknown authored
      Before this patch, the parser would execute:
      - Select->expr_list.push_front()
      - Select->expr_list.pop()
      when parsing expressions lists, in the following rules:
      - udf_expr_list
      - expr_list
      - ident_list
      
      This is unnecessary, and introduces overhead due to the memory allocations
      performed with Select->expr_list
      
      With this patch, this code has been removed.
      The list being parsed is maintained in the parser stack instead.
      
      Also, 'udf_expr_list' has been renamed 'opt_udf_expr_list', since this
      production can be empty.
      
      
      sql/sql_lex.cc:
        Removed unused attribute expr_list
      sql/sql_lex.h:
        Removed unused attribute expr_list
      sql/sql_yacc.yy:
        Improved performances when parsing expression lists
      5dc3e889
    • unknown's avatar
      Manual merge · 49fea65f
      unknown authored
      49fea65f
    • unknown's avatar
      Manual merge · d007e524
      unknown authored
      d007e524
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime · c34e2c7f
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
      
      
      BUILD/SETUP.sh:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      c34e2c7f
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 6f052e87
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-30237
      
      
      6f052e87
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 9d173ed2
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-23062
      
      
      9d173ed2
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · d4e34c80
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-30237
      
      
      sql/sql_yacc.yy:
        Auto merged
      d4e34c80
    • unknown's avatar
      Bug#30237 (Performance regression in boolean expressions) · fb1be0f1
      unknown authored
      This is a performance bug, related to the parsing or 'OR' and 'AND' boolean
      expressions.
      
      Let N be the number of expressions involved in a OR (respectively AND).
      
      When N=1
      
      For example, "select 1" involve only 1 term: there is no OR operator.
      
      In 4.0 and 4.1, parsing expressions not involving OR had no overhead.
      In 5.0, parsing adds some overhead, with Select->expr_list.
      
      With this patch, the overhead introduced in 5.0 has been removed,
      so that performances for N=1 should be identical to the 4.0 performances,
      which are optimal (there is no code executed at all)
      
      The overhead in 5.0 was in fact affecting significantly some operations.
      For example, loading 1 Million rows into a table with INSERTs,
      for a table that has 100 columns, leads to parsing 100 Millions of
      expressions, which means that the overhead related to Select->expr_list
      is executed 100 Million times ...
      
      Considering that N=1 is by far the most probable expression,
      this case should be optimal.
      
      When N=2
      
      For example, "select a OR b" involves 2 terms in the OR operator.
      
      In 4.0 and 4.1, parsing expressions involving 2 terms created 1 Item_cond_or
      node, which is the expected result.
      In 5.0, parsing these expression also produced 1 node, but with some extra
      overhead related to Select->expr_list : creating 1 list in Select->expr_list
      and another in Item_cond::list is inefficient.
      
      With this patch, the overhead introduced in 5.0 has been removed
      so that performances for N=2 should be identical to the 4.0 performances.
      Note that the memory allocation uses the new (thd->mem_root) syntax
      directly.
      The cost of "is_cond_or" is estimated to be neglectable: the real problem
      of the performance degradation comes from unneeded memory allocations.
      
      When N>=3
      
      For example, "select a OR b OR c ...", which involves 3 or more terms.
      
      In 4.0 and 4.1, the parser had no significant cost overhead, but produced
      an Item tree which is difficult to evaluate / optimize during runtime.
      In 5.0, the parser produces a better Item tree, using the Item_cond
      constructor that accepts a list of children directly, but at an extra cost
      related to Select->expr_list.
      
      With this patch, the code is implemented to take the best of the two
      implementations:
      - there is no overhead with Select->expr_list
      - the Item tree generated is optimized and flattened.
      
      This is achieved by adding children nodes into the Item tree directly,
      with Item_cond::add(), which avoids the need for temporary lists and memory
      allocation
      
      Note that this patch also provide an extra optimization, that the previous
      code in 5.0 did not provide: expressions are flattened in the Item tree,
      based on what the expression already parsed is, and not based on the order
      in which rules are reduced.
      
      For example : "(a OR b) OR c", "a OR (b OR c)" would both be represented
      with 2 Item_cond_or nodes before this patch, and with 1 node only with this
      patch. The logic used is based on the mathematical properties of the OR
      operator (it's associative), and produces a simpler tree.
      
      
      sql/item_cmpfunc.h:
        Improved performances for parsing boolean expressions
      sql/sql_yacc.yy:
        Improved performances for parsing boolean expressions
      mysql-test/r/parser_precedence.result:
        Added test cases to cover boolean operator precedence
      mysql-test/t/parser_precedence.test:
        Added test cases to cover boolean operator precedence
      fb1be0f1
  2. 21 Aug, 2007 5 commits
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 · abc02d7e
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
      
      
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      abc02d7e
    • unknown's avatar
      Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 7dd4e789
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
      
      
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      7dd4e789
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269 · 863eb5d5
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
      
      
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      863eb5d5
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 · b1d9eba3
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
      
      
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      b1d9eba3
    • unknown's avatar
      Bug#30269 Query cache eats memory · 3a5a0ea3
      unknown authored
      Although the query cache doesn't support retrieval of statements containing
      column level access control, it was still possible to cache such statements
      thus wasting memory.
        
      This patch extends the access control check on the target tables to avoid
      caching a statement with column level restrictions. 
      
      Views are excepted and can be cached but only retrieved by super user account.
      
      
      mysql-test/t/query_cache_with_views.test:
        Rename: mysql-test/t/view_query_cache.test -> mysql-test/t/query_cache_with_views.test
      mysql-test/r/query_cache_with_views.result:
        Rename: mysql-test/r/view_query_cache.result -> mysql-test/r/query_cache_with_views.result
      mysql-test/r/query_cache.result:
        Modified test case to allow caching of views
      mysql-test/t/query_cache.test:
        Modified test case to allow caching of views
      sql/sql_cache.cc:
        Allow caching of views
      3a5a0ea3
  3. 20 Aug, 2007 4 commits
    • unknown's avatar
      Fixed 5.0 -> 5.1 merge · 5f40dafc
      unknown authored
      5f40dafc
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime · 8d201090
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
      
      
      mysql-test/r/handler_myisam.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      mysql-test/include/handler.inc:
        Auto merged
      8d201090
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base · 78059064
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
      
      
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/rpl_record.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      78059064
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base · 3c52b2b3
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
      
      
      sql/sql_base.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      3c52b2b3
  4. 18 Aug, 2007 5 commits
    • unknown's avatar
      Bug #29307: status.test fails with different Table_locks_immediate · 0ece5608
      unknown authored
      Finish premature patch which was accidentally pushed; remove debugging
      info and correct the test.
      
      
      mysql-test/r/status.result:
        Correct test results
      mysql-test/t/status.test:
        Disable query log for one statement, and correct some comments
      0ece5608
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 994625d6
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      994625d6
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · 92838cc4
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      92838cc4
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · c68c271a
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      c68c271a
    • unknown's avatar
      Bug #29307: status.test fails with different Table_locks_immediate · 4f3c8e77
      unknown authored
      When using --log --log-output=table, we increment Table_locks_immediate
      with every query.  The wait_condition.inc runs a query a variable number
      of times, depending on server load, etc.  This is a problem, when the
      test is checking the Table_locks_immediate value.
      
      Fix is to adjust the Table_locks_immediate value based on how many times
      the wait_condition query was executed.
      
      
      mysql-test/include/wait_condition.inc:
        Add a $wait_condition_reps variable, which lets the caller check how
        many times the wait_condition query was executed.
        
        This is used in the main.status test to adjust the value of
        Table_locks_immediate (it gets incremented with each query
        when --log --log-output=table).
      mysql-test/t/status.test:
        Adjust Table_locks_immediate value based on how many times the
        wait_condition query had to run.
      4f3c8e77
  5. 17 Aug, 2007 10 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 3b1ec12f
      unknown authored
      into  moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
      
      
      3b1ec12f
    • unknown's avatar
      Bug#29936 (Stored Procedure DML ignores low_priority_updates setting) · 7ee93c16
      unknown authored
      This is a follow up for the patch for Bug#26162 "Trigger DML ignores low_priority_updates setting", where the stored procedure ignores the session setting of low_priority_updates.
      
      
      sql/lock.cc:
        Add late lock_type assertion.
      sql/sql_base.cc:
        Possibly downgrade lock type to the the session setting of low_priority_updates and also remove early assertion.
      7ee93c16
    • unknown's avatar
      Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 55e514ae
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
      
      
      55e514ae
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 · 3ff26995
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
      
      
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      3ff26995
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269 · 59c92e26
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
      
      
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_cache.h:
        Auto merged
      59c92e26
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 · c2460030
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
      
      
      mysql-test/r/query_cache.result:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_cache.h:
        Auto merged
      mysql-test/t/query_cache.test:
        Manual merge
      c2460030
    • unknown's avatar
      Bug #30269 Query cache eats memory · bd80048f
      unknown authored
      Although the query cache doesn't support retrieval of statements containing
      column level access control, it was still possible to cache such statements
      thus wasting memory.
      
      This patch extends the access control check on the target tables to avoid
      caching a statement with column level restrictions. 
      
      
      mysql-test/r/query_cache.result:
        Added test
      mysql-test/t/query_cache.test:
        Added test
      sql/sql_cache.cc:
        The function check_table_access leaves the artifact
        grant.want_privileges= 1, if a statement refers to tables with column level
        privileges. To avoid the statement from being stored into the query cache,
        it is enough to check this flag and set 'safe_to_cache_query' to zero.
      sql/sql_cache.h:
        - Removed 'static' attribute or class methods
        - Added THD parameter to process_and_count_tables
      bd80048f
    • unknown's avatar
      Bug#25856 (HANDLER table OPEN in one connection lock DROP TABLE in another one) · 8bdb043f
      unknown authored
      mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.
      
      This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).
      
      
      mysql-test/r/lock_multi.result:
        Bug#25856 test result
      mysql-test/t/lock_multi.test:
        Bug#25856 test case
      sql/sql_handler.cc:
        Move the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close.
      8bdb043f
    • unknown's avatar
      Minor fix to let the build proceed. · dc4a1ef8
      unknown authored
      
      sql/rpl_rli.h:
        Adding missing forward declaration.
      dc4a1ef8
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · dc4f7044
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/log_event.cc:
        Manual merge.
      dc4f7044
  6. 16 Aug, 2007 8 commits