An error occurred fetching the project authors.
  1. 07 Mar, 2007 5 commits
  2. 06 Mar, 2007 8 commits
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 31fc397c
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      31fc397c
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/maint/mar05/50 · 60997075
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      libmysql/libmysql.c:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      60997075
    • unknown's avatar
      Bug #25075: sql_class.cc doesn't compile with --without-query-cache · 5fdfea00
      unknown authored
      Wrap query_cache_init_query() call with #ifdef HAVE_QUERY_CACHE in THD::THD()
      
      
      5fdfea00
    • unknown's avatar
      Fix for bug #25595 "missing DBUG_RETURN in function "mysql_stat"" · 9a1ec4d3
      unknown authored
      libmysql/libmysql.c:
        Fix for bug #25595 "missing DBUG_RETURN in function "mysql_stat""
        
        Use DBUG_RETURN instead of return
      9a1ec4d3
    • 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
      Merge polly.local:/tmp/maint/bug20293/my50-bug20293 · 3e42ddda
      unknown authored
      into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
      
      
      mysql-test/r/func_time.result:
        Manual merge.
      mysql-test/t/func_time.test:
        Manual merge.
      3e42ddda
    • 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
  3. 05 Mar, 2007 7 commits
  4. 03 Mar, 2007 1 commit
  5. 02 Mar, 2007 7 commits
    • unknown's avatar
      Bug #21103: DATE column not compared as DATE · fed9bb98
      unknown authored
      If we compare two items A and B, with B being (a constant) of a
      larger type, then A gets promoted to B's type for comparison if
      it's a constant, function, or CAST() column, but B gets demoted
      to A's type if A is a (not explicitly CAST()) column. This is
      counter-intuitive and not mandated by the standard.
       
      Disabling optimisation where it would be lossy so field value
      will properly get promoted and compared as binary string (rather
      than as integers).
      
      
      mysql-test/include/ps_conv.inc:
        Bug #21103: DATE column not compared as DATE
        
        When comparing a DATE field with a DATETIME constant, we now compare
        as DATETIMEs, not as DATEs.  Fix certain queries to still work.
      mysql-test/r/func_time.result:
        Bug #21103: DATE column not compared as DATE
        
        When comparing a DATE field with a DATETIME constant, we now compare
        as DATETIMEs, not as DATEs.  Show that everything works as expected.
      mysql-test/r/ps_2myisam.result:
        Bug #21103: DATE column not compared as DATE
        
        When comparing a DATE field with a DATETIME constant, we now compare
        as DATETIMEs, not as DATEs.  Fix certain queries to still work.
      mysql-test/r/ps_3innodb.result:
        Bug #21103: DATE column not compared as DATE
        
        When comparing a DATE field with a DATETIME constant, we now compare
        as DATETIMEs, not as DATEs.  Fix certain queries to still work.
      mysql-test/r/ps_4heap.result:
        Bug #21103: DATE column not compared as DATE
        
        When comparing a DATE field with a DATETIME constant, we now compare
        as DATETIMEs, not as DATEs.  Fix certain queries to still work.
      mysql-test/r/ps_5merge.result:
        Bug #21103: DATE column not compared as DATE
        
        When comparing a DATE field with a DATETIME constant, we now compare
        as DATETIMEs, not as DATEs.  Fix certain queries to still work.
      mysql-test/r/ps_7ndb.result:
        Bug #21103: DATE column not compared as DATE
        
        When comparing a DATE field with a DATETIME constant, we now compare
        as DATETIMEs, not as DATEs.  Fix certain queries to still work.
      mysql-test/t/func_time.test:
        Bug #21103: DATE column not compared as DATE
        
        When comparing a DATE field with a DATETIME constant, we now compare
        as DATETIMEs, not as DATEs.  Show that everything works as expected.
      sql/field.cc:
        Bug #21103: DATE column not compared as DATE
        
        #0 stores the date only as a 3-byte integer; save_in_field() in
        #1 saves 'this' in field's format (DATE), #2 "converts a constant
        item to an int and replaces the original item" -- consequently,
        this replaces the Item_string "2006-11-06 04:08:36.0" with the
        Item_int_with_ref 20061106.
        
        #0  Field_newdate::store (this=0x8d26880, from=0x8d5e658 "2006-11-06
        04:08:36.0", len=21, cs=0x88022c0) at field.cc:5344
        #1  0x0817e3b0 in Item_string::save_in_field (this=0x8d5e670, field=0x8d26880, no_conversions=true) at item.cc:4340
        #2  0x081b22ae in convert_constant_item (thd=0x8d25240, field=0x8d26880, item=0x8d5e74c) at item_cmpfunc.cc:245
        #3  0x081b8a36 in Item_bool_func2::fix_length_and_dec (this=0x8d5e6f8) at item_cmpfunc.cc:309
        #4  0x081a3427 in Item_func::fix_fields (this=0x8d5e6f8, thd=0x8d25240, ref=0x8d5f5fc) at item_func.cc:190
        #5  0x0825bc2d in setup_conds (thd=0x8d25240, tables=0x8d5e410, leaves=0x8d5e410, conds=0x8d5f5fc) at sql_base.cc:4941
        ...
        
        Disabling optimisation where it would be lossy so field value will
        properly get promoted and compared as binary string (rather than as
        integers).
      fed9bb98
    • 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
      after merge fix (bug #26038) · d4272a16
      unknown authored
      Item_func_geometry_from_text::val_str() should set null_value
      in case of wrong data.
      
      
      mysql-test/include/gis_generic.inc:
        after merge fix
        
        Item_func_geometry_from_text::val_str() should set null_value
        in case of wrong data.
      mysql-test/r/archive_gis.result:
        after merge fix
        
        Item_func_geometry_from_text::val_str() should set null_value
        in case of wrong data.
      mysql-test/r/gis.result:
        after merge fix
        
        Item_func_geometry_from_text::val_str() should set null_value
        in case of wrong data.
      mysql-test/r/innodb_gis.result:
        after merge fix
        
        Item_func_geometry_from_text::val_str() should set null_value
        in case of wrong data.
      mysql-test/r/ndb_gis.result:
        after merge fix
        
        Item_func_geometry_from_text::val_str() should set null_value
        in case of wrong data.
      mysql-test/t/gis.test:
        after merge fix
        
        Item_func_geometry_from_text::val_str() should set null_value
        in case of wrong data.
      sql/item_geofunc.cc:
        after merge fix
        
        Item_func_geometry_from_text::val_str() should set null_value
        in case of wrong data.
      d4272a16
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b23616/b23616.4.1 · 7fc2a2a7
      unknown authored
      into  mysql.com:/home/ram/work/b23616/b23616.5.0
      
      
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      7fc2a2a7
    • 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
  6. 01 Mar, 2007 12 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
      After merge fixes · 6e6fa326
      unknown authored
      6e6fa326
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 0e6a060c
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      0e6a060c
    • unknown's avatar
      Add two more USE_CYGWIN ifdefs to mysqltest · 115a299f
      unknown authored
      115a299f
    • unknown's avatar
    • unknown's avatar
      Don't set the "is_windows" flag if using cygwin · a01e8043
      unknown authored
      a01e8043
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 · 4a9edcc3
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      client/mysqltest.c:
        Auto merged
      extra/comp_err.c:
        Auto merged
      include/my_time.h:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      client/mysql_upgrade.c:
        Manual merge
      mysql-test/mysql-test-run.pl:
        Manual merge
      mysql-test/r/ctype_cp932.result:
        Manual merge
      mysql-test/r/mysqlbinlog.result:
        Manual merge
      mysql-test/t/ctype_cp932.test:
        Manual merge
      mysql-test/t/mysql.test:
        Manual merge
      mysql-test/t/mysqlbinlog.test:
        Manual merge
      4a9edcc3
    • 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 bk-internal:/home/bk/mysql-4.1-maint · 38c26f4a
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
      
      
      sql/mysqld.cc:
        Auto merged
      38c26f4a
    • unknown's avatar
      MySQL versions before 5.0 still use cygwin, no need · b40ef082
      unknown authored
      to convert path
      
      
      b40ef082
    • 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