1. 31 Aug, 2007 1 commit
    • unknown's avatar
      Test cleanup for events.test · 584aa4c4
      unknown authored
      
      mysql-test/r/events.result:
        Fixed all the select on information_schema.processlist to be more reliable.
      mysql-test/t/events.test:
        Fixed all the select on information_schema.processlist to be more reliable.
      584aa4c4
  2. 30 Aug, 2007 15 commits
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 31460885
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
      
      
      sql/sql_insert.cc:
        Auto merged
      31460885
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base · b60d2825
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      b60d2825
    • unknown's avatar
      Post-merge test case with wait_condition for Bug#28587 · 4393673c
      unknown authored
      
      mysql-test/r/insert_update.result:
        Post-merge: add test case result for Bug#28587.
      mysql-test/t/insert_update.test:
        Post-merge: add test case for Bug#28587.
      4393673c
    • unknown's avatar
      Merge moksha.local:/Users/davi/mysql/push/bugs/28587-5.0 · 3baba645
      unknown authored
      into  moksha.local:/Users/davi/mysql/push/bugs/28587-5.1
      
      
      sql/sql_insert.cc:
        Auto merged
      3baba645
    • unknown's avatar
      Bug#28587 SELECT is blocked by INSERT waiting on read lock, even with low_priority_updates · bca7cdf5
      unknown authored
      The problem is that a SELECT on one thread is blocked by INSERT ... ON
      DUPLICATE KEY UPDATE on another thread even when low_priority_updates is
      activated.
      
      The solution is to possibly downgrade the lock type to the setting of
      low_priority_updates if the INSERT cannot be concurrent.
      
      
      sql/sql_insert.cc:
        Possibly downgrade lock type to the the setting of low_priority_updates if
        if the INSERT cannot be concurrent.
      bca7cdf5
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 65a37674
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
      
      65a37674
    • unknown's avatar
      Bug#28779 (mysql_query() allows execution of statements with unbalanced · 19978117
      unknown authored
      comments)
      
      This change set is for 5.1 (manually merged)
      
      Before this fix, the server would accept queries that contained comments,
      even when the comments were not properly closed with a '*' '/' marker.
      
      For example,
        select 1 /* + 2 <EOF>
      would be accepted as
        select 1 /* + 2 */ <EOF>
      and executed as
        select 1
      
      With this fix, the server now rejects queries with unclosed comments
      as syntax errors.
      Both regular comments ('/' '*') and special comments ('/' '*' '!') must be
      closed with '*' '/' to be parsed correctly.
      
      
      mysql-test/r/comments.result:
        Unbalanced comments are a syntax error.
      mysql-test/t/comments.test:
        Unbalanced comments are a syntax error.
      sql/sql_lex.cc:
        Unbalanced comments are a syntax error.
      19978117
    • unknown's avatar
      Add -Wno-unused to --warning-mode=pedantic, otherwise sql/ compilation · 3d110250
      unknown authored
      generated so many warnings that the mode was unusable.
      
      3d110250
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime · 8a21c6a8
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
      
      
      mysql-test/r/comments.result:
        failed auto merge
      mysql-test/t/comments.test:
        failed auto merge
      sql/sql_lex.cc:
        failed auto merge
      8a21c6a8
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 6d0145d2
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-28779-b
      
      6d0145d2
    • unknown's avatar
      Cleanup-patch for BUG#25843: changing default database between · c922dc94
      unknown authored
      PREPARE and EXECUTE of statement breaks binlog.
      
      
      sql/sp.cc:
        - Polishing sp_use_new_db():
          - renamed no_access_check to force_switch to be more adequate;
          - fixed comment;
      sql/sql_class.h:
        Polishing: fixed comment.
      sql/sql_db.cc:
        1. Use mysql_change_db_impl() to reset current database instead of
        THD::set_db() in mysql_rm_db(). THD::set_db() does not take care of
        THD::db_access and database attributes (@@collation_database).
        2. Polishing: add, fix comments.
      c922dc94
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164 · 0ae167fc
      unknown authored
      into  polly.(none):/home/kaa/src/bug30164/my51-bug30164
      
      
      mysql-test/t/mysql.test:
        Auto merged
      0ae167fc
    • unknown's avatar
      Use double quotes instead of single ones which make the test fail on Windows.... · 9b845d82
      unknown authored
      Use double quotes instead of single ones which make the test fail on Windows. This is for bug #30164.
      
      
      mysql-test/t/mysql.test:
        Use double quotes instead of single ones which make the test fail on Windows.
      9b845d82
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164 · 7e04943b
      unknown authored
      into  polly.(none):/home/kaa/src/bug30164/my51-bug30164
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      7e04943b
    • unknown's avatar
      Bug #30164: Using client side macro inside server side comments generates broken queries · 72f86a4a
      unknown authored
        
      Problem:
        
      In cases when a client-side macro appears inside a server-side comment, the add_line() function in mysql.cc discarded all characters until the next delimiter to remove macro arguments from the query string. This resulted in broken queries being sent to the server when the next delimiter character appeared past the comment's boundaries, because the comment closing sequence ('*/') was discarded.
        
      Fix:
        
      If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro (that is, until the end of the comment rather than the next delimiter).
      This is a minimal fix to allow only simple cases used by the mysqlbinlog utility. Limitations that are worth documenting:
        
      - Nested server-side and/or client-side comments are not supported by mysql.cc
      - Using client-side macros in multi-line server-side comments is not supported
      - All characters after a client-side macro in a server-side comment will be omitted from the query string (and thus, will not be sent to server).
      
      
      client/mysql.cc:
        If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro.
      mysql-test/r/mysql.result:
        Added a test case for bug #30164.
      mysql-test/t/mysql.test:
        Added a test case for bug #30164.
      72f86a4a
  3. 29 Aug, 2007 8 commits
    • unknown's avatar
      Manual merge · f432c528
      unknown authored
      f432c528
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime · 8c9c6479
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
      
      
      mysql-test/r/sp.result:
        failed auto merge
      mysql-test/t/sp.test:
        failed auto merge
      8c9c6479
    • unknown's avatar
      Post-merge fixes for Bug#30632 · 8a3020be
      unknown authored
      
      mysql-test/r/handler_innodb.result:
        Post-merge: add Bug#30632 test case result
      mysql-test/r/handler_myisam.result:
        Post-merge fix of error number
      8a3020be
    • unknown's avatar
      Added ORDER BY to udf select so that results are ordered. · 3dbbdbe4
      unknown authored
      
      mysql-test/include/rpl_udf.inc:
        ORDER BY to force order
      mysql-test/suite/rpl/r/rpl_udf.result:
        Fix for ORDER BY
      3dbbdbe4
    • unknown's avatar
      Merge moksha.local:/Users/davi/mysql/push/bugs/old/30632-5.0 · ca6733d5
      unknown authored
      into  moksha.local:/Users/davi/mysql/push/bugs/30632-5.1
      
      
      sql/sql_handler.cc:
        Auto merged
      mysql-test/include/handler.inc:
        Auto merged
      mysql-test/r/handler_myisam.result:
        Auto merged
      ca6733d5
    • unknown's avatar
      Bug#28779 (mysql_query() allows execution of statements with unbalanced · bd9fa259
      unknown authored
      comments)
      
      Before this fix, the server would accept queries that contained comments,
      even when the comments were not properly closed with a '*' '/' marker.
      
      For example,
        select 1 /* + 2 <EOF>
      would be accepted as
        select 1 /* + 2 */ <EOF>
      and executed as
        select 1
      
      With this fix, the server now rejects queries with unclosed comments
      as syntax errors.
      Both regular comments ('/' '*') and special comments ('/' '*' '!') must be
      closed with '*' '/' to be parsed correctly.
      
      
      mysql-test/r/comments.result:
        Unbalanced comments are a syntax error.
      mysql-test/t/comments.test:
        Unbalanced comments are a syntax error.
      sql/sql_lex.cc:
        Unbalanced comments are a syntax error.
      bd9fa259
    • unknown's avatar
      Bug#21975 Grant and revoke statements are non-transactional · c6178eb7
      unknown authored
      Bug#21422 GRANT/REVOKE possible inside stored function, probably in a trigger
      Bug#17244 GRANT gives strange error message when used in a stored function
      
      GRANT/REVOKE statements are non-transactional (no explicit transaction
      boundaries) in nature and hence are forbidden inside stored functions and
      triggers, but they weren't being effectively forbidden. Furthermore, the
      absence of implict commits makes changes made by GRANT/REVOKE statements to
      not be rolled back.
      
      The implemented fix is to issue a implicit commit with every GRANT/REVOKE
      statement, effectively prohibiting these statements in stored functions
      and triggers. The implicit commit also fixes the replication bug, and looks
      like being in concert with the behavior of DDL and administrative statements.
      
      Since this is a incompatible change, the following sentence should be
      added to the Manual in the very end of the 3rd paragraph, subclause
      13.4.3 "Statements That Cause an Implicit Commit": "Beginning with
      MySQL 5.0.??, the GRANT and REVOKE statements cause an implicit commit."
      
      Patch contributed by Vladimir Shebordaev
      
      
      mysql-test/r/sp-error.result:
        Test case result for Bug#17244
      mysql-test/t/sp-error.test:
        Test case for Bug#17244
      sql/sp_head.cc:
        Set that a procedure with GRANT/REVOKE command has a (implicit or explicit)
        commit.
      sql/sql_parse.cc:
        End active transaction in SQLCOM_GRANT and SQLCOM_REVOKE, and thus effectively
        prohibit these statements in stored functions and triggers. An implicit commit
        also fixes a bug in replication, when GRANT or REVOKE would disappear from the
        binary log in case of a subsequent ROLLBACK, since they were considered
        transactional statements.
      mysql-test/suite/rpl/r/rpl_binlog_grant.result:
        Add test case result for Bug#21975
      mysql-test/suite/rpl/t/rpl_binlog_grant.test:
        Add test case for Bug#21975
      c6178eb7
    • unknown's avatar
      Test case for Bug#13675: DATETIME/DATE type in store proc param · eabe782c
      unknown authored
      seems to be converted as varbinary.
      
      The bug has been already fixed. This CS just adds a test case for it.
      
      
      mysql-test/r/sp.result:
        Update result file.
      mysql-test/t/sp.test:
        Test case for BUG#13675.
      eabe782c
  4. 28 Aug, 2007 5 commits
    • unknown's avatar
      Manual merge · d3c67a0d
      unknown authored
      d3c67a0d
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 75f30f37
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
      
      75f30f37
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · fdb5f1c3
      unknown authored
      into  moksha.local:/Users/davi/mysql/push/mysql-5.0-runtime
      
      fdb5f1c3
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime · 844da2b5
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
      
      
      sql/sql_yacc.yy:
        automerge failed.
      844da2b5
    • unknown's avatar
      Bug#30625 (Performance, reduce depth for expressions) · be8db2de
      unknown authored
      This is a performance bug, affecting in particular the bison generated code
      for the parser.
      
      Prior to this fix, the grammar used a long chain of reduces to parse an
      expression, like:
        bit_expr -> bit_term
        bit_term -> bit_factor
        bit_factor -> value_expr
        value_expr -> term
        term -> factor
      etc
      
      This chain of reduces cause the internal state automaton in the generated
      parser to execute more state transitions and more reduces, so that the
      generated MySQLParse() function would spend a lot of time looping to execute
      all the grammar reductions.
      
      With this patch, the grammar has been reorganized so that rules are more
      "flat", limiting the depth of reduces needed to parse <expr>.
      
      Tests have been written to enforce that relative priorities and properties
      of operators have not changed while changing the grammar.
      
      See the bug report for performance data.
      
      
      mysql-test/r/parser_precedence.result:
        Improved test coverage for operator precedence
      mysql-test/t/parser_precedence.test:
        Improved test coverage for operator precedence
      sql/sql_yacc.yy:
        Simplified the grammar to improve performances
      be8db2de
  5. 27 Aug, 2007 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 88516bcb
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      client/mysqlslap.c:
        Auto merged
      storage/example/ha_example.cc:
        Auto merged
      88516bcb
    • unknown's avatar
      Bug#30632 HANDLER read failure causes hang · a5415f5e
      unknown authored
      If, after the tables are locked, one of the conditions to read from a
      HANDLER table is not met, the handler code wrongly jumps to a error path
      that won't unlock the tables.
      
      The user-visible effect is that after a error in a handler read command,
      all subsequent handler operations on the same table will hang.
      
      The fix is simply to correct the code to jump to the (same) error path that
      unlocks the tables.
      
      
      mysql-test/r/handler.result:
        Bug#30632 test case result
      mysql-test/t/handler.test:
        Bug#30632 test case
      sql/sql_handler.cc:
        Always unlock the internal and external table level locks if any of the conditions
        (including errors) to read from a HANDLER table are not met.
      a5415f5e
    • unknown's avatar
      Merge moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime · 5a360fa9
      unknown authored
      into  moksha.local:/Users/davi/mysql/push/bugs/29936-5.1
      
      5a360fa9
    • unknown's avatar
      Merge moksha.local:/Users/davi/mysql/push/bugs/25164-5.0 · dad4d61b
      unknown authored
      into  moksha.local:/Users/davi/mysql/push/bugs/25164-5.1
      
      
      sql/lock.cc:
        Auto merged
      mysql-test/include/deadlock.inc:
        Auto merged
      mysql-test/r/deadlock_innodb.result:
        Auto merged
      dad4d61b
    • unknown's avatar
      Bug#25164 create table `a` as select * from `A` hangs · 80c782aa
      unknown authored
      The problem from a user's perspective: user creates table A, and then tries
      to CREATE TABLE a SELECT from A - and this causes a deadlock error, a hang,
      or fails with a debug assert, but only if the storage engine is InnoDB.
      
      The origin of the problem: InnoDB uses case-insensitive collation
      (system_charset_info) when looking up the internal table share, thus returning
      the same share for 'a' and 'A'.
      
      Cause of the user-visible behavior: since the same share is returned to SQL
      locking subsystem, it assumes that the same table is first locked (within the
      same session) for WRITE, and then for READ, and returns a deadlock error.
      However, the code is wrong in not properly cleaning up upon an error, leaving
      external locks in place, which leads to assertion failures and hangs.
      
      Fix that has been implemented: the SQL layer should properly propagate the
      deadlock error, cleaning up and freeing all resources.
      
      Further work towards a more complete solution: InnoDB should not use case
      insensitive collation for table share hash if table names on disk honor the case.
      
      
      mysql-test/r/innodb-deadlock.result:
        Bug#25164 test case result
      mysql-test/t/innodb-deadlock.test:
        Bug#25164 test case. The CREATE TABLE may fail depending on the character set
        of the system and filesystem, but it should never hang.
      sql/lock.cc:
        Unlock the storage engine "external" table level locks, if the MySQL thr_lock
        locking subsystem detects a deadlock error.
      80c782aa
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 98fd2f64
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      configure.in:
        null-merge
      98fd2f64
    • unknown's avatar
      adjust version number · 6cb66383
      unknown authored
      
      configure.in:
        adjust version number after 5.0.48 clone-off
      6cb66383
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 60513c68
      unknown authored
      into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
      
      60513c68
  6. 25 Aug, 2007 3 commits
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel · 5612453b
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      5612453b
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main · 05a6d8fe
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      client/mysqldump.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/status.result:
        Auto merged
      sql/event_db_repository.cc:
        Auto merged
      sql/event_queue.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/log_event_old.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/status.test:
        Manual resolve with 5.1.
      sql/log_event.cc:
        Manual resolve with 5.1.
      sql/sql_yacc.yy:
        Manual resolve with 5.1.
      05a6d8fe
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main · eaa87d37
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
      
      eaa87d37