1. 06 Mar, 2007 3 commits
    • unknown's avatar
      Manual merge · f7414b28
      unknown authored
      f7414b28
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 307c9f1e
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-8407_b
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/sql_base.cc:
        Manual merge
      307c9f1e
    • unknown's avatar
      Bug#8407 (Stored functions/triggers ignore exception handler) · 266a7fff
      unknown authored
      Bug 18914 (Calling certain SPs from triggers fail)
      Bug 20713 (Functions will not not continue for SQLSTATE VALUE '42S02')
      Bug 21825 (Incorrect message error deleting records in a table with a
        trigger for inserting)
      Bug 22580 (DROP TABLE in nested stored procedure causes strange dependency
        error)
      Bug 25345 (Cursors from Functions)
      
      
      This fix resolves a long standing issue originally reported with bug 8407,
      which affect the behavior of Stored Procedures, Stored Functions and Trigger
      in many different ways, causing symptoms reported by all the bugs listed.
      In all cases, the root cause of the problem traces back to 8407 and how the
      server locks tables involved with sub statements.
      
      Prior to this fix, the implementation of stored routines would:
      - compute the transitive closure of all the tables referenced by a top level
      statement
      - open and lock all the tables involved
      - execute the top level statement
      "transitive closure of tables" means collecting:
      - all the tables,
      - all the stored functions,
      - all the views,
      - all the table triggers
      - all the stored procedures
      involved, and recursively inspect these objects definition to find more
      references to more objects, until the list of every object referenced does
      not grow any more.
      This mechanism is known as "pre-locking" tables before execution.
      The motivation for locking all the tables (possibly) used at once is to
      prevent dead locks.
      
      One problem with this approach is that, if the execution path the code
      really takes during runtime does not use a given table, and if the table is
      missing, the server would not execute the statement.
      This in particular has a major impact on triggers, since a missing table
      referenced by an update/delete trigger would prevent an insert trigger to run.
      
      Another problem is that stored routines might define SQL exception handlers
      to deal with missing tables, but the server implementation would never give
      user code a chance to execute this logic, since the routine is never
      executed when a missing table cause the pre-locking code to fail.
      
      With this fix, the internal implementation of the pre-locking code has been
      relaxed of some constraints, so that failure to open a table does not
      necessarily prevent execution of a stored routine.
      
      In particular, the pre-locking mechanism is now behaving as follows:
      
      1) the first step, to compute the transitive closure of all the tables
      possibly referenced by a statement, is unchanged.
      
      2) the next step, which is to open all the tables involved, only attempts
      to open the tables added by the pre-locking code, but silently fails without
      reporting any error or invoking any exception handler is the table is not
      present. This is achieved by trapping internal errors with
      Prelock_error_handler
      
      3) the locking step only locks tables that were successfully opened.
      
      4) when executing sub statements, the list of tables used by each statements
      is evaluated as before. The tables needed by the sub statement are expected
      to be already opened and locked. Statement referencing tables that were not
      opened in step 2) will fail to find the table in the open list, and only at
      this point will execution of the user code fail.
      
      5) when a runtime exception is raised at 4), the instruction continuation
      destination (the next instruction to execute in case of SQL continue
      handlers) is evaluated.
      This is achieved with sp_instr::exec_open_and_lock_tables()
      
      6) if a user exception handler is present in the stored routine, that
      handler is invoked as usual, so that ER_NO_SUCH_TABLE exceptions can be
      trapped by stored routines. If no handler exists, then the runtime execution
      will fail as expected.
      
      With all these changes, a side effect is that view security is impacted, in
      two different ways.
      
      First, a view defined as "select stored_function()", where the stored
      function references a table that may not exist, is considered valid.
      The rationale is that, because the stored function might trap exceptions
      during execution and still return a valid result, there is no way to decide
      when the view is created if a missing table really cause the view to be invalid.
      
      Secondly, testing for existence of tables is now done later during
      execution. View security, which consist of trapping errors and return a
      generic ER_VIEW_INVALID (to prevent disclosing information) was only
      implemented at very specific phases covering *opening* tables, but not
      covering the runtime execution. Because of this existing limitation,
      errors that were previously trapped and converted into ER_VIEW_INVALID are
      not trapped, causing table names to be reported to the user.
      This change is exposing an existing problem, which is independent and will
      be resolved separately.
      
      
      mysql-test/r/information_schema_db.result:
        Revised the pre-locking code implementation, aligned the tests.
      mysql-test/r/sp-error.result:
        Revised the pre-locking code implementation, aligned the tests.
      mysql-test/r/sp.result:
        Revised the pre-locking code implementation, aligned the tests.
      mysql-test/r/trigger.result:
        Revised the pre-locking code implementation, aligned the tests.
      mysql-test/r/view.result:
        Revised the pre-locking code implementation, aligned the tests.
      mysql-test/t/sp-error.test:
        Revised the pre-locking code implementation, aligned the tests.
      mysql-test/t/sp.test:
        Revised the pre-locking code implementation, aligned the tests.
      mysql-test/t/trigger.test:
        Revised the pre-locking code implementation, aligned the tests.
      sql/lock.cc:
        table->placeholder now checks for schema_table
      sql/mysqld.cc:
        my_message_sql(): invoke internal exception handlers
      sql/sp_head.cc:
        exec_open_and_lock_tables(): open and lock tables, or return the
        continuation destination of this instruction
      sql/sp_head.h:
        exec_open_and_lock_tables(): open and lock tables, or return the
        continuation destination of this instruction
      sql/sql_base.cc:
        Prelock_error_handler: delay open table errors until execution
      sql/sql_class.cc:
        THD: add internal error handler, as an exception mechanism.
      sql/sql_class.h:
        THD: add internal error handler, as an exception mechanism.
      sql/sql_update.cc:
        table->placeholder now checks for schema_table
      sql/table.cc:
        st_table_list::hide_view_error(): masked more errors for view security
      sql/table.h:
        table->placeholder now checks for schema_table, and unopened tables
      266a7fff
  2. 05 Mar, 2007 1 commit
  3. 02 Mar, 2007 4 commits
    • unknown's avatar
      Freeze the number of conflicts. We should not introduce any more · f7f5f006
      unknown authored
      conflicts without proper analysis and documentation of the nature of
      the conflict.
      
      
      f7f5f006
    • unknown's avatar
      Rename a macro to better reflect the action taken. · b0e07932
      unknown authored
      
      sql/sql_yacc.yy:
        Rename: YYERROR_UNLESS -> YYABORT_UNLESS
        yyerror doesn't have to abort of the parser, whereas this macro
        does explicitly call YYABORT.
      b0e07932
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 133e08af
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-26093
      
      
      sql/item_func.cc:
        Auto merged
      133e08af
    • unknown's avatar
      Bug#26093 (SELECT BENCHMARK() for SELECT statements does not produce valid · 0a93be28
      unknown authored
        results)
      
      Before this fix, the function BENCHMARK() would fail to evaluate expressions
      like "(select avg(a) from t1)" in debug builds (with an assert),
      or would report a time of zero in non debug builds.
      
      The root cause is that evaluation of DECIMAL_RESULT expressions was not
      supported in Item_func_benchmark::val_int().
      
      This has been fixed by this change.
      
      
      mysql-test/r/func_misc.result:
        Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()
      mysql-test/t/func_misc.test:
        Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()
      sql/item_func.cc:
        Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()
      0a93be28
  4. 01 Mar, 2007 16 commits
    • unknown's avatar
      Manual merge of 5.0 into 5.0-runtime · 09d82a1a
      unknown authored
      
      mysql-test/r/subselect.result:
        Manual merge
      mysql-test/t/subselect.test:
        Manual merge
      09d82a1a
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base · 57b6c864
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      server-tools/instance-manager/instance_options.cc:
        Auto merged
      server-tools/instance-manager/mysqlmanager.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      57b6c864
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-4.1-base · 71d12e9f
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-4.1-runtime
      
      
      sql/sql_parse.cc:
        Auto merged
      71d12e9f
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0 · 3616b5e3
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/field.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      3616b5e3
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings · 92e7cf15
      unknown authored
      into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
      
      
      92e7cf15
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · a7ec72b2
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
      
      
      a7ec72b2
    • unknown's avatar
      Removing two more compilation warnings. · 8fa0d1b9
      unknown authored
      
      sql/slave.cc:
        Guard declaration of variable to avoid "unused variable" warning.
      sql/sql_repl.cc:
        Guard declaration of variable to avoid "unused variable" warning.
      8fa0d1b9
    • unknown's avatar
      Fixed compiler warnings. · 33ccc756
      unknown authored
      
      client/mysqltest.c:
        Fixed a compiler warning.
      support-files/compiler_warnings.supp:
        Suppressed compiler warnings on Win 64.
      33ccc756
    • unknown's avatar
      Disabled compiler warnings. · c04d5985
      unknown authored
      
      sql/ha_archive.cc:
        Fixed a warning from unused computed value. This block is
        only used in debug mode and changes nothing.
      support-files/compiler_warnings.supp:
        Disabled a warning from BDB.
      c04d5985
    • unknown's avatar
      Fix for wrong replace command. · 30ece9b0
      unknown authored
      30ece9b0
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bk/mysql-5.0-bug25463 · 16e9e7ed
      unknown authored
      into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
      
      
      16e9e7ed
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings · 6632872b
      unknown authored
      into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
      
      
      6632872b
    • unknown's avatar
      Renaming recenly added test case, because of name conflict · ef02cb63
      unknown authored
      when merging into 5.1.
      
      
      mysql-test/t/rpl_loaddata_charset.test:
        Rename: mysql-test/t/rpl_loaddata2.test -> mysql-test/t/rpl_loaddata_charset.test
      mysql-test/r/rpl_loaddata_charset.result:
        Rename: mysql-test/r/rpl_loaddata2.result -> mysql-test/r/rpl_loaddata_charset.result
      ef02cb63
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · fdb1170e
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      fdb1170e
    • unknown's avatar
      Fixes of compilation warnings and errors. · b3fafa40
      unknown authored
      
      sql/mysql_priv.h:
        Removing compiler warning "NULL used in arithmetic"
      sql/mysqld.cc:
        First argument to WARN_DEPRECATED is supposed to be a pointer (to THD structure)
      sql/sql_insert.cc:
        Removing compiler warning "unused variable". Apparently query is not used when compiling libmysqld.
      sql/sql_yacc.yy:
        Removing compiler error "Macro already defined"
      b3fafa40
    • unknown's avatar
      Additional fix for bug N 15126 · d93c7f39
      unknown authored
      Replacing local directory.
      
      
      mysql-test/r/mysqlbinlog.result:
        Additional fix for bug N 15126
      mysql-test/t/mysqlbinlog.test:
        Additional fix for bug N 15126
      d93c7f39
  5. 28 Feb, 2007 9 commits
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · d5e983aa
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      d5e983aa
    • unknown's avatar
      Fixed compiler warnings. · def9c0b2
      unknown authored
      
      client/mysql_upgrade.c:
        Fixed problem with mysql_upgrade being dependent
        on local my.cnf files and problem with memory not being freed.
      client/mysqltest.c:
        Changed type to avoid warning.
      cmd-line-utils/readline/xmalloc.c:
        Fix to avoid warning.
      include/my_dbug.h:
        To disable parts from code in non-debug more.
      sql/field.cc:
        Fixed warning.
      sql/ha_archive.cc:
        Fixed warning.
      sql/ha_berkeley.cc:
        Added casts to avoid warnings.
      sql/ha_ndbcluster.cc:
        Fixed warnings.
      sql/log.cc:
        Added casts to avoid warnings.
      sql/slave.cc:
        Avoid warning.
      sql/sql_repl.cc:
        Avoid warning.
      support-files/compiler_warnings.supp:
        Added disabled warnings to compiler_warnings.supp file.
        These are backported mainly from 5.1 suppress file, but there
        are some additional new ones.
      def9c0b2
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · a2b4f529
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b24478
      
      
      a2b4f529
    • unknown's avatar
      Additional test changes for · 4a83cd38
      unknown authored
      Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
      Positions of some binlog events were changed because of
      additional logging of @@collation_database.
      
      
      4a83cd38
    • unknown's avatar
      After merge fix · 18f1d1a2
      unknown authored
      18f1d1a2
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · de61d5b0
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b15126
      
      
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/mysqlbinlog.result:
        After merge fix
      mysql-test/t/mysqlbinlog.test:
        After merge fix
      de61d5b0
    • unknown's avatar
      Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it) · c3a3aff5
      unknown authored
      This patch fixes problem that LOAD DATA could use different
      character sets when loading files on master and on slave sides:
      - Adding replication of thd->variables.collation_database
      - Adding optional character set clause into LOAD DATA
      
      Note, the second way, with explicit CHARACTER SET clause
      should be the recommended way to load data using an alternative
      character set.
      The old way, using "SET @@character_set_database=xxx" should be
      gradually depricated.
      
      
      mysql-test/r/mysqlbinlog.result:
        Adding test case
      mysql-test/t/mysqlbinlog.test:
        Adding test case
      sql/log_event.cc:
        Adding logging of thd->variables.collation_database
      sql/log_event.h:
        Adding declarations
      sql/sql_class.cc:
        Exchange character set is null by default
      sql/sql_class.h:
        Adding character set into sql_exchange
      sql/sql_load.cc:
        - Using exchange character set (if it was specified in LOAD DATA syntax)
        - Using thd->variables.collation_database by default
      sql/sql_yacc.yy:
        Adding optional character set clause into LOAD DATA syntax
      mysql-test/r/rpl_loaddata2.result:
        New BitKeeper file ``mysql-test/r/rpl_loaddata2.result''
      mysql-test/std_data/loaddata6.dat:
        New BitKeeper file ``mysql-test/std_data/loaddata6.dat''
      mysql-test/t/rpl_loaddata2.test:
        New BitKeeper file ``mysql-test/t/rpl_loaddata2.test''
      c3a3aff5
    • unknown's avatar
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · 9c8637dc
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-bug25306
      
      
      9c8637dc
  6. 27 Feb, 2007 6 commits
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · f0e5877c
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-bug25306
      
      
      sql/slave.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      f0e5877c
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 0ddc3250
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/sql_load.cc:
        Manual merge
      0ddc3250
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 3f507f29
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      3f507f29
    • unknown's avatar
      BUG#20141 "User-defined variables are not replicated properly for · 4be9d3cc
      unknown authored
                SF/Triggers in SBR mode."
      BUG#14914 "SP: Uses of session variables in routines are not always replicated"
      BUG#25167 "Dupl. usage of user-variables in trigger/function is not replicated
                correctly"
      
      This patch corrects a minor error in the previous patch for BUG#20141. This patch
      corrects an errant code change to sp_head.cc. The comments for the first patch follow:
      
      User-defined variables used inside of stored functions/triggers in
      statements which did not update tables directly were not replicated.
      We also had problems with replication of user-defined variables which
      were used in triggers (or stored functions called from table-updating
      statements) more than once.
      
      This patch addresses the first issue by enabling logging of all
      references to user-defined variables in triggers/stored functions
      and not only references from table-updating statements.
      
      The second issue stemmed from the fact that for user-defined
      variables used from triggers or stored functions called from
      table-updating statements we were writing binlog events for each
      reference instead of only one event for the first reference.
      This problem is already solved for stored functions called from
      non-updating statements with help of "event unioning" mechanism.
      So the patch simply extends this mechanism to the case affected.
      It also fixes small problem in this mechanism which caused wrong
      logging of references to user-variables in cases when non-updating
      statement called several stored functions which used the same
      variable and some of these function calls were omitted from binlog
      as they were not updating any tables.
      
      
      sql/sp_head.cc:
        BUG#20141 "User-defined variables are not replicated properly for 
                  SF/Triggers in SBR mode."
        
        This patch corrects a minor error in the previous patch for BUG#20141. The code:
        
        q= ::query_id; 
        
        was an errant line of code that was not intended to be in the patch. Instead, the
        correct line of code is:
        
        q= global_query_id;
      4be9d3cc
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · e91d2738
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b24478
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_trigger.h:
        Auto merged
      e91d2738
    • unknown's avatar
      removed unused variable · 3a520a78
      unknown authored
      3a520a78
  7. 26 Feb, 2007 1 commit
    • unknown's avatar
      Fix for BUG#26050 "LOAD DATA INFILE breaks ACID"; the ok must be sent · 2e669d8e
      unknown authored
      to the client only after the binlog write and engine commit.
      No testcase for this bug, as to reproduce it, we need to "kill -9" mysqld,
      which we cannot do in the testsuite. But, I tested by hand.
      
      
      sql/sql_load.cc:
        D in ACID means that once the client got the ok from the server, the data
        is durable on disk. Implies that the ok must be sent after the binlog write
        and after the engine commit, not before.
      2e669d8e