1. 19 Nov, 2005 1 commit
    • unknown's avatar
      Fix for bug #13825 "Triggers: crash if release savepoint" and for general · 2722ebcd
      unknown authored
      handling of savepoints in stored routines.
      
      Fixed ha_rollback_to_savepoint()/ha_savepoint()/ha_release_savepoint()
      functions to properly handle savepoints inside of stored functions and
      triggers.
      Also now when we invoke stored function or trigger we create new savepoint
      level. We destroy it at the end of function/trigger execution and return back
      to old savepoint level.
      
      
      mysql-test/r/sp_trans.result:
        Added test for bug #13825 "Triggers: crash if release savepoint" and for
        general handling of savepoints in stored routines.
      mysql-test/t/sp_trans.test:
        Added test for bug #13825 "Triggers: crash if release savepoint" and for
        general handling of savepoints in stored routines.
      sql/ha_innodb.cc:
        innobase_savepoint():
          Replaced check which always failed due to similar check in caller
          with assertion.
      sql/handler.cc:
        ha_rollback_to_savepoint()/ha_savepoint()/ha_release_savepoint():
          Changed functions to properly support handling of savepoints
          inside of stored functions and triggers.
      sql/sql_class.cc:
        THD::reset_sub_statement_state()/restore_sub_statement_state():
          When we invoke stored function or trigger we should create new savepoint
          level. We should destroy it at the end of function/trigger execution and
          return back to old savepoint level. To support this behavior we should
          save and reset list of current savepoints on entering function and restore
          old list when we leave it.
      sql/sql_class.h:
        Sub_statement_state:
          When we invoke stored function or trigger we should create new savepoint
          level. We should destroy it at the end of function/trigger execution and
          return back to old savepoint level. To support this behavior added "savepoint"
          member which is used to save/restore list of current savepoints on
          entering/leaving function.
      sql/sql_parse.cc:
        mysql_execute_command():
          Changed processing of SQLCOM_SAVEPOINT so now it is not ignored when
          we are in autocommit mode and savepoint is set inside of stored
          function or trigger.
      2722ebcd
  2. 28 Oct, 2005 14 commits
  3. 27 Oct, 2005 25 commits
    • unknown's avatar
      Merge 4.1 - 5.0 · 2e4a3a91
      unknown authored
      
      mysql-test/r/insert_select.result:
        Merge from 4.1 to 5.0.
      mysql-test/r/select.result:
        Merge from 4.1 to 5.0.
      mysql-test/t/insert_select.test:
        Merge from 4.1 to 5.0.
      mysys/my_handler.c:
        Merge from 4.1 to 5.0.
      sql/item.cc:
        Merge from 4.1 to 5.0.
      sql/item_timefunc.cc:
        Imported bug fix from 4.1 to 5.0. (Bug#14016)
      sql/item_timefunc.h:
        Imported bug fix from 4.1 to 5.0. (Bug#14016)
      2e4a3a91
    • unknown's avatar
      fixe of typos, comments & layout · 03cafab5
      unknown authored
      
      sql/item_func.cc:
        fixed typo
      sql/sql_acl.cc:
        comment fixed
      sql/sql_parse.cc:
        comment fixed
      sql/sql_view.cc:
        layout fixed
      sql/table.cc:
        typo fixed
        layout fixed
      sql/table.h:
        typo fixed
      03cafab5
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 9ffea155
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      9ffea155
    • unknown's avatar
      support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787) · 9c6c527c
      unknown authored
      
      mysql-test/r/information_schema.result:
        error message changed
      mysql-test/r/sp.result:
        error message changed
      mysql-test/r/sql_mode.result:
        fixed test suite
      mysql-test/r/view.result:
        error message changed
      mysql-test/r/view_grant.result:
        test of underlying view tables check
      mysql-test/t/sql_mode.test:
        fixed test suite
      mysql-test/t/view_grant.test:
        test of underlying view tables check
      sql/item.cc:
        check of underlying tables privilege added
      sql/item.h:
        Name the resolution context points to the security  context of view (if item belong to the view)
      sql/item_func.cc:
        a view error hiding for execution of prepared function belonged to a view
        fixed checking privileges if stored functions belonds to some view
      sql/mysql_priv.h:
        refult of derived table processing functions changed to bool
        Security_context added as an argument to find_field_in_table()
      sql/share/errmsg.txt:
        error message fixed
      sql/sql_acl.cc:
        Storing requested privileges of tables added
        View underlying tables privilege check added
      sql/sql_base.cc:
        View underlying tables privilege check added
      sql/sql_cache.cc:
        Code cleunup: we should not register underlying tables of view second time
      sql/sql_delete.cc:
        ancestor -> merge_underlying_list renaming
      sql/sql_derived.cc:
        refult of derived table processing functions changed to bool
        do not give SELECT_ACL for TEMPTABLE views
      sql/sql_lex.h:
        The comment added
      sql/sql_parse.cc:
        registration of requested privileges added
      sql/sql_prepare.cc:
        registration of requested privileges added
      sql/sql_update.cc:
        manipulation of requested privileges for underlying tables made the same as for table which we are updating
      sql/sql_view.cc:
        underlying tables of view security check support added
      sql/table.cc:
        renaming and fixing view preparation methods, methods for checking underlyoing tables security context added
      sql/table.h:
        storege for reuested privileges added
      9c6c527c
    • unknown's avatar
      Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 · 7fc229ed
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
      
      
      heap/_check.c:
        Auto merged
      heap/hp_create.c:
        Auto merged
      include/config-netware.h:
        Auto merged
      include/my_base.h:
        Auto merged
      include/my_handler.h:
        Auto merged
      include/myisam.h:
        Auto merged
      innobase/include/Makefile.am:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/mi_delete.c:
        Auto merged
      myisam/mi_rnext_same.c:
        Auto merged
      myisam/mi_search.c:
        Auto merged
      myisam/mi_write.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/update.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/update.test:
        Auto merged
      mysys/my_getopt.c:
        Auto merged
      mysys/my_handler.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/records.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/structs.h:
        Auto merged
      strings/conf_to_src.c:
        Auto merged
      strings/ctype-win1250ch.c:
        Auto merged
      Makefile.am:
        Merged from 4.1
      myisam/myisamchk.c:
        Merged from 4.1
      mysql-test/mysql-test-run.pl:
        Merged from 4.1
      mysql-test/r/insert_select.result:
        Merged from 4.1
      mysql-test/r/myisam.result:
        Merged from 4.1
      mysql-test/r/select.result:
        Merged from 4.1
      mysql-test/t/insert_select.test:
        Merged from 4.1
      mysql-test/t/myisam.test:
        Merged from 4.1
      netware/mysql_test_run.c:
        Merged from 4.1
      sql/item.cc:
        Merged from 4.1
      sql/mysqld.cc:
        Merged from 4.1
      sql/sql_update.cc:
        Merged from 4.1
      tests/mysql_client_test.c:
        Merged from 4.1
      7fc229ed
    • unknown's avatar
      Add DROP TABLE before trying to create view (in mysqldump) · 22501603
      unknown authored
      Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
      (Note that archive_gis.test fails, but this is independent of this patch)
      
      
      client/mysqldump.c:
        Add DROP TABLE to be able to re-run mysqldump if it fails after 'table-named-as-view' is created
      mysql-test/include/gis_generic.inc:
        Remove dependency of ndb
      mysql-test/include/have_archive.inc:
        Fix syntax
      mysql-test/include/have_geometry.inc:
        Fix syntax
      mysql-test/r/mysqldump.result:
        New test results after adding 'drop table'
      mysql-test/t/archive_gis.test:
        gis_generic tests for have_geometry.inc
      mysql-test/t/bdb_gis.test:
        gis_generic tests for have_geometry.inc
      mysql-test/t/innodb_gis.test:
        gis_generic tests for have_geometry.inc
      mysql-test/t/ndb_gis.test:
        gis_generic tests for have_geometry.inc
      sql/item_func.cc:
        Simplify code (as signal_divide_by_null sets 'null_value')
      22501603
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 24fccc5a
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      24fccc5a
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-14009 · 2d9654a5
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      sql/item_func.cc:
        Auto merged
      2d9654a5
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 11108771
      unknown authored
      into moonbone.local:/work/13855-bug-4.1-mysql
      
      11108771
    • unknown's avatar
      select.result: · ef12b2c8
      unknown authored
        After merge fix
      
      
      mysql-test/r/select.result:
        After merge fix
      ef12b2c8
    • unknown's avatar
      Manually merged · 32b21cfa
      unknown authored
      
      include/config-netware.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/select.result:
        Manually merged fix for bug#13855
      mysql-test/t/select.test:
        Manuall merged fix for bug#13855
      32b21cfa
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7b68c0be
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-4.1-innobase
      
      7b68c0be
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · d2d611f7
      unknown authored
      into  selena.:H:/MYSQL/src/#13377-mysql-5.0a
      
      d2d611f7
    • unknown's avatar
      Fix for the patch #13377. Avoids race condition for relay logs close. · 2240f0d1
      unknown authored
      Code that closes current relay log is moved to purge_relay_logs().
      
      2240f0d1
    • unknown's avatar
      conf_to_src.c: · 9db1fffd
      unknown authored
        Dump MY_CS_CSSORT when it's necessary.
      
      
      strings/conf_to_src.c:
        Dump MY_CS_CSSORT when it's necessary.
      9db1fffd
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e66934f6
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      e66934f6
    • unknown's avatar
      Fixes during review of pushed code · 0f33a2ed
      unknown authored
      Added back missing return in mysql_delete()
      
      
      mysql-test/my_manage.c:
        Cleanup: Remove some #ifdef
      mysql-test/r/drop_temp_table.result:
        Delete database that may be left from other test
      mysql-test/t/drop_temp_table.test:
        Delete database that may be left from other test
      sql/log.cc:
        false -> FALSE
        true -> TRUE
        Wait until readers_count is 0 (not just for a signal)
        
        NOTE: it's very likely that the way to handle readers_count is wrong.
        (We are in pthread_cond_wait freeing a mutex that is not the innermost mutex,
        which can lead to deadlocks)
        
        I will talk with Guilhem about this ASAP
      sql/log_event.h:
        Remove number from last even to help future merges
        (all compilers I know of can handle this properly)
      sql/sql_delete.cc:
        Add back missing RETURN (was lost in a merge)
        Indentation fixes
      0f33a2ed
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · fafd2749
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
      
      fafd2749
    • unknown's avatar
      Fix for Bug #14388 "IM eats 99% CPU" · 511f8be4
      unknown authored
      
      server-tools/instance-manager/listener.cc:
        reinitialize timer used in select(), as on linux it is modified
        to reflect amout of time not slept (e.g. set ot zero)
      511f8be4
    • unknown's avatar
      conf_to_src.c: · 426e2f8a
      unknown authored
        Updating to conform the current CHARSET_INFO structure.
      
      
      strings/conf_to_src.c:
        Updating to conform the current structure.
      426e2f8a
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f84aaaf9
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b13347
      
      f84aaaf9
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 35e3d043
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b14290
      
      35e3d043
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · ad5dcc4f
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my50
      
      ad5dcc4f
    • unknown's avatar
      ndb - base64 compile fix in ndbapi test · 292ca7a3
      unknown authored
      
      ndb/test/src/HugoCalculator.cpp:
        does not use Base64.hpp which was renamed to base64.h
      292ca7a3
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 9457e47c
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug12166
      
      9457e47c