1. 28 Dec, 2005 1 commit
    • unknown's avatar
      WL #1034 (update) · 3a12408a
      unknown authored
      - improve the stability of the executor
      - make create event if not exists work as before
      
      
      sql/event.cc:
        refactoring:
        - have only 1 routine for comparing TIME structures 
        fix:
        - after previous refactoring IF NOT EXISTS of CREATE EVENT did not work 
          anymore. Now it will work.
      sql/event.h:
        update definitions
      sql/event_executor.cc:
        - don't load DISABLED events
        - if an event is being disabled because of time restrictions - drop it from the 
          prio queue
        - move dropping to the worker process
      sql/event_priv.h:
        - remove unneeded func
      sql/share/errmsg.txt:
        fix error message
      sql/sql_parse.cc:
        - support 0 rows affected when CREATE EVENT IF NOT EXISTS
      3a12408a
  2. 20 Dec, 2005 1 commit
    • unknown's avatar
      WL #1034 update · 9b323387
      unknown authored
      - fix one bug found by PeterG, namely bug #51
      
      #there is a major problem currently after removing the specialised DYNAMIC_ARRAY as 
        storage for the events. I have to reintroduce similar storage, this time probably some
        linked list or maybe some API on top of DYNAMIC_ARRAY.
      
      
      sql/event.cc:
        close the table
      sql/event.h:
        change definition
      sql/event_executor.cc:
        don't start the thread in advance
      sql/event_timed.cc:
        - don't call evex_drop_event
        - quote the name during compilation to make create event `the rain in spain goes into the drain` not fail.
      9b323387
  3. 16 Dec, 2005 3 commits
    • unknown's avatar
      WL #1034 update · a820fa4f
      unknown authored
      - varchar -> char
      - transient_expression -> interval_value
      - interval_type -> interval_field
      
      
      mysql-test/lib/init_db.sql:
        - varchar -> char
        - transient_expression -> interval_value
        - interval_type -> interval_field
      scripts/mysql_fix_privilege_tables.sql:
        - varchar -> char
        - transient_expression -> interval_value
        - interval_type -> interval_field
      sql/event.h:
        - varchar -> char
        - transient_expression -> interval_value
        - interval_type -> interval_field
      a820fa4f
    • unknown's avatar
      WL #1034 update · 7634f7d6
      unknown authored
      - handle crashes where the table definition has been changed
        (different number of fields)
      
      
      sql/event.cc:
        change the way table is opened
        check whether the number of fields is exact, otherwise report damaged table
      sql/event_executor.cc:
        - move around some code
        - use the new way of table opening
      sql/event_priv.h:
        - new declaration
      sql/event_timed.cc:
        - now 0 is ok
      7634f7d6
    • unknown's avatar
      WL#1034 update · 2d11a567
      unknown authored
      fix bug with DROP EVENT non_existant; giving back OK + warning
      
      
      sql/share/errmsg.txt:
        fix error message
      sql/sql_parse.cc:
        check the result from the function so in case of non-existing
        event don't return OK which will make the error already thrown
        an warning
      2d11a567
  4. 15 Dec, 2005 2 commits
    • unknown's avatar
      WL#1034 update · 20bcd568
      unknown authored
      make compile-pentium-debug-max work
      
      
      libmysqld/Makefile.am:
        compile all three into libmysqld
      20bcd568
    • unknown's avatar
      WL#1034 update · 48405ec7
      unknown authored
      - fix EVENT_ACL problem that GRANT ALL on some_db.* to someone@somewhere did not get to mysql.db
      - fix crash when the following is executed :
        CREATE EVENT P() CREATE EVENT E ON SCHEDULER 1 SECOND DO ROLLBACK;
        (creation works as well as calling P() which creates the event).
      
      
      mysql-test/lib/init_db.sql:
        - fix init_db.sql so add Event_priv to the database privs, many tests failed because of that
          ommision
        - remove the quotes from the column names
      mysql-test/t/events.test:
        - fix the small test, don't create own db
      scripts/mysql_fix_privilege_tables.sql:
        - fix that
      sql/event.cc:
        - be defensive and don't crash if outside has already has opened some table
      sql/event_executor.cc:
        - show in SHOW PROCESSLIST - "event_scheduler" as name of the user of the main thread
        - use "localhost" as the host where event_scheduler comes from
        - comment out some debug info, fix other debug info
      sql/event_timed.cc:
        - enable EVENT creation inside SP. sphead from lex->sphead goes to et->sphead. it's there only
          if we compile the event. OTOH when doing 
          CREATE PROCEDURE PROC() CREATE EVENT SOME_EV ON SCHEDULE EVERY 1 SECOND DO ROLLBACK;
          I have only to get the body of the event which is anonymous SP. Before it being "compiled"
          but then freed without being used because a bit later it is compiled one more time before
          being put in the events cache. So it was good that the memory structures weren't reused but
          scrapped out. Now lex->sphead is not needed during event creation but only where the event's
          body starts and where it ends so to be able at later stage to compile this anonymous SP (the
          body of the event).
      sql/sp_head.cc:
        - copy over a fix to a crash
      sql/sql_acl.h:
        - fix privileges.
          There was _NO_ documentation about that. Another CHUNK had to be created to so EVENT_ACL gets shifted to
          it's place in the db table. So how this is calculated? EVENT_ACL is 1 << 26. Remember 26, see which poistion
          in the db table is EVENT_ACL, it's 17, counted from 0. 26 - 17 = 9, then shift it with 9.
          CHUNKS are created because in some cases some privileges are in chunks and they are shifted at once. There are
          few chunks of such privileges which has to be shifted to get to exactly the structure of mysql.db table.
      sql/sql_parse.cc:
        - ok, we don't care anymore about lex->sphead because our sphead is lex->et->sphead
      sql/sql_yacc.yy:
        - bail out if new event_timed returns 0x0
        - enable creation of an event inside a SP
          CREATE PROCEDURE P() CREATE EVENT E ON SCHEDULE EVERY 1 SECOND DO SELECT 1;
      48405ec7
  5. 14 Dec, 2005 1 commit
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl1034 · b67555d5
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      libmysqld/Makefile.am:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      b67555d5
  6. 13 Dec, 2005 3 commits
    • unknown's avatar
      WL#1034 (update) · d22bb45c
      unknown authored
      - fixed silly bug, the main thread restarted but did not execute events,
        Quite currious why many calls to pthread_mutex_init() do not lead to abort()
      
      
      sql/event.cc:
        - remove mysql_event_table_exists
        - fix possible crash when table is 0x0
      sql/event_executor.cc:
        - make event_executor_running_global_var volatile
        - fix erroneous reinitilization of a mutex, why did it not crash in debug mode?
          why pthread_mutex_init() does not abort() in case the mutex was not deinitted
          beforehand?
        - first initialization of event_executor_running_global_var inside init_mutexes()
        - remove debug if()
      sql/event_priv.h:
        - remove unneeded definitions
      sql/event_timed.cc:
        make backup and then restore the open table state of thd
      d22bb45c
    • unknown's avatar
      WL#1034 update · f92086d0
      unknown authored
      (cleanups, leaks fixed)
      
      
      sql/event.cc:
        - update comments
        - remove dead code
        - event_timed is no more copied after allocation on a DYNAMIC_ARRAY
          because there is a problem when the array is reallocated - we get
          dangling pointers from the scheduling queue. anyway it makes little
          sense to keep them there except that cleaning is quite efficient but
          iterating over all events and cleaning them one by one is not that bad
          considering that happens only when the main scheduler thread is killed
          or during server shutdown.
      sql/event_executor.cc:
        - DYNAMIC_ARRAY is no more
      sql/event_priv.h:
        - remove unneeded code/defines. the scheduler's queue is of 
          type QUEUE and cannot run anymore on top of DYNAMIC_ARRAY
      sql/event_timed.cc:
        - after parsing (in ::compile() ) destruct the event_timed object
      sql/sql_parse.cc:
        in case of syntax error clean up lex->et because there could be an object
        created. as in the code the same is done for SPs.
      f92086d0
    • unknown's avatar
      WL#1034 update · 112d408f
      unknown authored
      cleanup before throwin away DYNAMIC_ARRAY for event storage,
      once reallocated I get dangling pointers so that's not good.
      solution will be found however ;)
      
      
      sql/event.cc:
        - remove unneeded variables
        - remove commented out code
        - remove non-cs compliant comment
        - fix a bug when removing from memory cache
        - better close the tables than relying on sql_parse.cc::do_command()
          to do that
      sql/event_executor.cc:
        - cleanup
      sql/event_priv.h:
        -cleanup
      sql/event_timed.cc:
        cleanup
      112d408f
  7. 12 Dec, 2005 1 commit
    • unknown's avatar
      WL#1034 update · 81eadfca
      unknown authored
      QUEUE implementation working now. this should be ready more or less
      for testing once the debug output is being cleaned and some things
      around DYNAMIC_ARRAY are cleaned
      - fix handling in case of errors that lead to crashes, now no more crashes
        in case of table corruption and such.
      
      
      include/queues.h:
        introduce a safe version of queue_insert that will extend the queue if
        necessary. the auto_extent is passed to the _ex version of init_queue()
      mysys/queues.c:
        add init_queue_ex() implementation
        add queue_insert_safe() implementation
      sql/event.cc:
        - move mysql_priv.h inclusion to event_priv.h
        - use a priority queue instead of DYNAMIC_ARRAY which is sorted
      sql/event.h:
        reorder
      sql/event_executor.cc:
        reorder
      sql/event_priv.h:
        - reorder a bit
        - add macroses and functions for queue manipulation which stay on top
         of QUEUE (partly implemented for DYNAMIC_ARRAY but will be cleared to be
         only for QUEUE).
      sql/event_timed.cc:
        allocate one more byte and zeroterminate, really
      81eadfca
  8. 08 Dec, 2005 2 commits
    • unknown's avatar
      WL #1034 update · 1c5573a4
      unknown authored
      - handle better non-latin1 identifiers
      
      
      sql/event.cc:
        - introduce a wrapper to compare easily and correctly
        LEX_STRINGs
        - remove few unneeded variables
        - remove need_second_pass by restructuring the code. this brings
          performance boost because the code bails out from the loop once
          it hits what it looks for
        - handle ALTER EVENT name RENAME TO name  (throw an error message).
      sql/event_executor.cc:
        - comment about DBUG_FAULTY_THR
        - indent fix
      sql/event_timed.cc:
        - fix a problem when event name is not latin1. a cyrillic event name
          was crashing the parser so the I emulate SET NAMES utf8. The data is
          already in utf8, being loaded from the disk.
      sql/share/errmsg.txt:
        add new error message
      1c5573a4
    • unknown's avatar
      - last bits of unneeded error checking in sql_parse.cc thrown away · c1cb8db8
      unknown authored
      - fix a bug introduced with last commit ALTER EVENT a RENAME TO b; failed
      - misc
      
      
      sql/event.cc:
        - rename evex_db_find_routine_aux() to evex_db_find_event_aux() (better name)
        - change parameter order of db_update_event()
        - last bits to handle errors as close as possible to the place they occur
        - fix a bug introduced with last commit: first check for overwriting and event and then
          check whether the original one exists
      sql/event.h:
        add a new error code returned by event_timed::compile() in case of 
        error
      sql/event_priv.h:
        rename
      sql/event_timed.cc:
        - function rename
        - add a bit of doc
      sql/share/errmsg.txt:
        - extend an error message so it's more informative
        - add a new error message
      sql/sql_parse.cc:
        refactor the cases for CREATE/ALTER/DROP event so use as much common
        code as possible. last bits of error checking unneeded in sql_parse.cc
        thrwon out.
      c1cb8db8
  9. 07 Dec, 2005 3 commits
    • unknown's avatar
      WL #1034 updates after review · faa8995e
      unknown authored
      (strip m_ as prefix from member variables' names)
      
      
      sql/event.cc:
        - change copyright years
        - remove m_ prefix from member variables (I liked m_)
        - reorder parameter in evex_update_event()
      sql/event.h:
        - change copyright years
        - remove m_ prefix from member variables
        - declare some member variables as private (were public)
        - delete 0 is valid in C++ therefore don't embrace with if()
      sql/event_executor.cc:
        - executor => scheduler in messages
        - fix a bug introduced in last commit -> typo in a mutex name
        - remove m_ prefix from member variables
      sql/event_priv.h:
        - change copyright years
      sql/event_timed.cc:
        - change copyright years
        - strip m_ as prefix from member variables' names
      sql/sql_parse.cc:
        - strip m_ as prefix from member variables' names
      sql/sql_yacc.yy:
        - strip m_ as prefix from member variables names
      faa8995e
    • unknown's avatar
      WL #1034 updates after review · a4bcbd51
      unknown authored
      
      sql/event.cc:
        - fix TODO (remove things already done)
        - check the length of the event's name and body during creation
          and report an error if longer than what can be fit into 
          mysql.event (nothing like non-strict mode here)
        - report to sql_parse.cc and error when open table failed, otherwise send_ok()
          was being called and the error have become an warning.
        - update function documentation a bit
        - evex_db_find_routine_aux returns 0 and not EVEX_OK
      sql/event_executor.cc:
        - CS changes to definitions of the main and worker thread routines
        - reorder code a bit to prevent crashes because of reading of
          already freed data -> first wait all events to finish their work,
          namely all worker threads to finish, and then destroy in-memory
          structures
        - more error checking and error reporting at the place of failure.
      sql/event_priv.h:
        code simplifying macro
      sql/event_timed.cc:
        CS cosmetics
      a4bcbd51
    • unknown's avatar
      WL#1034 ongoing updates after review · bc3708a5
      unknown authored
      
      sql/event.cc:
        -my_error() as close as possible to the place where the error
         occurs.
        -a thought how to replicate events
        -use close_thread_tables() in some cases and for others rely on
         this call being done in sql_parse.cc::do_command()
      sql/event.h:
        remove redundant defines
      sql/event_executor.cc:
        - reenable the compilation again
        - don't backup the open_tables_state, it's not needed
      sql/event_timed.cc:
        - inline a bit
        - comment added
      sql/mysqld.cc:
        - start mysqld with --event-scheduler=0 by default
      sql/share/errmsg.txt:
        3 new messages
      sql/sql_parse.cc:
        remove now obsolete error checking - the errors are reported
        as closer as possible to the place where they are detected
      sql/sql_yacc.yy:
        add WARNING message. fix a bug that was corrupting 
        thd->client_capabilites ->
        select count(*) from mysql.event
        was reporting : "Unknown table test.event"!!!
        Using temporal variable is nice but IMO quite error-prone.
      bc3708a5
  10. 06 Dec, 2005 3 commits
    • unknown's avatar
      rever · a581a4a1
      unknown authored
      
      sql/sp_head.cc:
        revert
      a581a4a1
    • unknown's avatar
      WL#1034 · 7838d468
      unknown authored
      make more independent of SP
      
      
      sql/event.cc:
        use own routine - export it
      sql/event_priv.h:
        export these two
      sql/event_timed.cc:
        use own routine, don't rely on SP
      sql/sp.cc:
        revert changes to SP
      sql/sp.h:
        revert changes to SP
      sql/sql_show.cc:
        rever changes to SP
      7838d468
    • unknown's avatar
      WL#1034 · 70856a0d
      unknown authored
      updated sources
      
      
      sql/event.cc:
        update
        put some error calls to the places they occur
      sql/event.h:
        - change the default (does not work in STRICT mode)
      sql/event_executor.cc:
        move mutex initialization to evex_init_mutexes so init_events() can be reused when the
        main thread does not work and set global event_scheduler=1; (this will start the thread)
        The main thread is now visible with show processlist and can be killed.
      sql/event_priv.h:
        don't use anymore SP for opening table
      sql/event_timed.cc:
        don't use anymore SP routines for opening mysql.event
      sql/mysqld.cc:
        shutdown_events() should be maximal at the end of the server because
        it destroys mutexes of EVEX. The call should not be in the main thread.
      sql/set_var.cc:
        make sys_var_event_executor subclass sys_var_bool_ptr
        to overload ::update() method - needed to start a
        killed (non-running) evex main thread
      sql/set_var.h:
        declare class sys_var_event_executor
      sql/share/errmsg.txt:
        2 new messages
      70856a0d
  11. 05 Dec, 2005 1 commit
    • unknown's avatar
      WL#1034 updated · 7ff79771
      unknown authored
      - split into several files
      - forbid parallel execution (before analyse is done how to make it possible)
        because the same sp_head instance cannot be executed in parallel
      - added GPL headers
      - changed EVENT_ACL to be per DB variable
      - fixed minor problems
      
      
      mysql-test/lib/init_db.sql:
        WL#1034 updated
        - add Event_priv to mysql.user (update test)
        - add updated mysql.event table struct
      scripts/mysql_fix_privilege_tables.sql:
        WL#1034 updated
        add updated mysql.event structure
      sql/Makefile.am:
        split event.cc into
        - event.cc (create/alter/drop)
        - event_executor.cc (main and worker threads)
        - event_timed.cc (class event_timed)
        - event_priv.h (some definitions used internally by the module)
      sql/event.cc:
        - added GPL header
        - split into few files
        - fixed some issues after code review
        - now using SP routines for opening/traversing/closing tables
          (will be reverted)
      sql/event.h:
        - add GPL header
        - remove two methods - inline them in sql_yacc.yy 
        - don't use absolute values for EVEX_ defines but the SP_ equivalents (have to move 100% to SP_
          defines and as later step to not transfer messages upwards in the stack but
          report them at the place they occur)
        - updated reference table definition
        - move default mem_root param from event.cc to the header
      sql/mysqld.cc:
        WL#1034
        rename --event-executor to --event-scheduler
        executor sounds a bit scary :)
      sql/set_var.cc:
        rename internal variable name from event_executor to event_scheduler
        (ppl won't be scarried anymore :)
      sql/share/errmsg.txt:
        omit one %s - not needed
      sql/sp_head.cc:
        disable this DBUG_PRINT for a bit. m_next_cached_sp is 0x0 and I get crash here...
      sql/sp_head.h:
        remove m_old_cmq, a temporal variable is used in sql_yacc.yy (Serg's idea)
        to keep the previous state.
        $<ulong_val>$ =  ....
        
        YYTHD->client_capabilites != $<ulong_val>4;
        
        (the same is done also for class event_timed)
      sql/sql_acl.cc:
        handle pre-5.1.4 table and give the user EVENT_ACL if he had CREATE_ACL
      sql/sql_acl.h:
        fix the bitmask
      sql/sql_parse.cc:
        - move from EVENT_ACL being global to EVENT_ACL being per DB like
          CREATE_PROC_ACL
        - lex->m_qname dropped, because not needed, fix code therefore
        - add comment that SHOW CREATE EVENT has to be implemented
      sql/sql_yacc.yy:
        - use temporal variable of Bison to store a short lived value
        - fix indentation
        - inline 2 class event_timed methods in the parser
      sql/tztime.h:
        be more expressive - it's already extern
      7ff79771
  12. 02 Dec, 2005 6 commits
  13. 01 Dec, 2005 13 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-clean · 15a1774e
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.1-clean
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/unireg.h:
        Auto merged
      mysql-test/r/mysqldump.result:
        Fix conflict
      mysql-test/t/mysqldump.test:
        Fix conflict
      15a1774e
    • unknown's avatar
      Post-merge result file cleanup · 025d8c14
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Fix results
      025d8c14
    • unknown's avatar
      Merge selena.:H:/MYSQL/bkt/mysql-5.0 · 8705383a
      unknown authored
      into  selena.:H:/MYSQL/bkt/mysql-5.1
      
      
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      8705383a
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-13318 · 3016ec15
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Resolve conflicts
      mysql-test/t/mysqldump.test:
        Resolve conflicts
      3016ec15
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12612 · f604204f
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/r/func_equal.result:
        Auto merged
      mysql-test/t/func_equal.test:
        Auto merged
      sql/item_cmpfunc.cc:
        SCCS merged
      f604204f
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-keysize · 5df3be70
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      5df3be70
    • unknown's avatar
      Enable key lengths of up to 3K on 32-bit platforms. · 4b4f7f76
      unknown authored
      
      mysql-test/r/bdb.result:
        Add new results
      mysql-test/r/innodb.result:
        Add new results
      mysql-test/t/bdb.test:
        Add simple test that large keys are allowed
      mysql-test/t/innodb.test:
        Add simple test that large keys are allowed
      sql/unireg.h:
        Allow key length of 3K even on 32-bit platforms
      4b4f7f76
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9dcae047
      unknown authored
      into  selena.:H:/MYSQL/src/#14902-mysql-5.0
      
      
      mysql-test/r/analyze.result:
        SCCS merged
      mysql-test/t/analyze.test:
        SCCS merged
      9dcae047
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.1-virgin · 90b240e7
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.1-dbg
      
      
      90b240e7
    • unknown's avatar
      Fix for bug#11491 Misleading error message if not NULL column set to NULL, · c86ba5f5
      unknown authored
                        SQL mode TRADITIONAL
        Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR'
      
      
      mysql-test/r/auto_increment.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/create.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/insert.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/insert_select.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/key.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/null.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/null_key.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/ps_2myisam.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/ps_3innodb.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/ps_4heap.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/ps_5merge.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/ps_6bdb.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/ps_7ndb.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/strict.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/view.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/r/warnings.result:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          result change
      mysql-test/t/strict.test:
        Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                          SQL mode TRADITIONAL
          test change
      c86ba5f5
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · babaa74e
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      babaa74e
    • unknown's avatar
      Fix for bug #14304: auto_increment field incorrect set from within stored... · f853fbc9
      unknown authored
      Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
      
      
      sql/sp_head.cc:
        Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
        - call thd->cleanup_after_query() to clean next_insert_id.
      sql/sql_class.cc:
        Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
        - save/restore clear_next_insert_id
      sql/sql_class.h:
        Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
        - clear_next_insert_id added
      f853fbc9
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · f784ffb2
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.1-dbg
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      f784ffb2