An error occurred fetching the project authors.
  1. 12 Apr, 2006 1 commit
    • unknown's avatar
      Post-merge fixes. Add a new error message for max_prepared_stmt_count · e3ae0951
      unknown authored
      limit.
      
      
      mysql-test/r/ps.result:
        Post-merge fixes.
      mysql-test/t/ps.test:
        Post-merge fixes.
      sql/share/errmsg.txt:
        Add a new error message for max_prepared_stmt_count limit,
        we can do it in 5.0
      sql/sql_class.cc:
        Post-merge fixes.
      sql/sql_class.h:
        Post-merge fixes.
      sql/sql_prepare.cc:
        Post-merge fixes.
      e3ae0951
  2. 11 Apr, 2006 1 commit
    • unknown's avatar
      BUG#18752: Also handle NULL values in VALUES LESS THAN · 1073c5bf
      unknown authored
      mysql-test/r/partition.result:
        Added test case to verify that VALUES LESS THAN (NULL) isn't allowed
      mysql-test/t/partition.test:
        Added test case to verify that VALUES LESS THAN (NULL) isn't allowed
      sql/share/errmsg.txt:
        Added new error message
      sql/sql_yacc.yy:
        Added error check for null value
      1073c5bf
  3. 10 Apr, 2006 1 commit
    • unknown's avatar
      BUG#18750: Various problems with partition names, quotation marks · e54a0fc7
      unknown authored
      mysql-test/r/partition.result:
        Added new test cases
      mysql-test/t/partition.test:
        Added new test cases
      sql/partition_info.cc:
        Check partition names that they don't have trailing spaces
      sql/share/errmsg.txt:
        Added error code for wrong partition names
      sql/sql_partition.cc:
        New method to add partition name strings, ignore OPTION_SHOW_QUOTE_CREATE
      sql/sql_show.cc:
        require_quotes had a bug with identifiers that consisted of only digits,
        these are allowed identifiers but must be quoted and require_quote didn't
        tell this.
      sql/sql_yacc.yy:
        Partition names should identifers and not ident_or_text
      e54a0fc7
  4. 24 Mar, 2006 1 commit
    • unknown's avatar
      WL 2826: Error handling of ALTER TABLE for partitioning · f298ddd8
      unknown authored
      Loads of review comments fixed
      inactivate => deactivate
      table log => ddl log
      Commented on Error Inject Module added
      Put various #defines into enums
      Fixed abort_and_upgrade_lock, removed unnecessary parameter
      Fixed mysqlish method intro's
      Fixed warning statements
      5.1.7 was released still with partition states in clear text
      
      Fixed io_size bug
      Fixed bug in open that TRUNCATED before reading :)
      file_entry => file_entry_buf
      Don't open DDL log until first write call to DDL log
      handler_type => handler_name
      no => num
      
      
      
      sql/ha_partition.cc:
        Loads of review comments fixed
        inactivate => deactivate
        table log => ddl log
      sql/mysql_priv.h:
        Loads of review comments fixed
        inactivate => deactivate
        table log => ddl log
        Commented on Error Inject Module added
        Put various #defines into enums
        Fixed abort_and_upgrade_lock, removed unnecessary parameter
      sql/mysqld.cc:
        Loads of review comments fixed
        inactivate => deactivate
        table log => ddl log
        Commented on Error Inject Module added
        Put various #defines into enums
        Fixed abort_and_upgrade_lock, removed unnecessary parameter
      sql/partition_element.h:
        Loads of review comments fixed
        inactivate => deactivate
        table log => ddl log
        Commented on Error Inject Module added
        Put various #defines into enums
        Fixed abort_and_upgrade_lock, removed unnecessary parameter
      sql/partition_info.h:
        Loads of review comments fixed
        inactivate => deactivate
        table log => ddl log
        Commented on Error Inject Module added
        Put various #defines into enums
        Fixed abort_and_upgrade_lock, removed unnecessary parameter
      sql/share/errmsg.txt:
        Loads of review comments fixed
        inactivate => deactivate
        table log => ddl log
        Commented on Error Inject Module added
        Put various #defines into enums
        Fixed abort_and_upgrade_lock, removed unnecessary parameter
      sql/sql_base.cc:
        Loads of review comments fixed
        inactivate => deactivate
        table log => ddl log
        Commented on Error Inject Module added
        Put various #defines into enums
        Fixed abort_and_upgrade_lock, removed unnecessary parameter
      sql/sql_partition.cc:
        Loads of review comments fixed
        inactivate => deactivate
        table log => ddl log
        Commented on Error Inject Module added
        Put various #defines into enums
        Fixed abort_and_upgrade_lock, removed unnecessary parameter
        Fixed mysqlish method intro's
        Fixed warning statements
      sql/sql_table.cc:
        Loads of review comments fixed
        inactivate => deactivate
        table log => ddl log
        Commented on Error Inject Module added
        Put various #defines into enums
        Fixed abort_and_upgrade_lock, removed unnecessary parameter
        Fixed mysqlish method intro's
        Fixed warning statements
        Fixed io_size bug
        Fixed bug in open that TRUNCATED before reading :)
        file_entry => file_entry_buf
        Don't open DDL log until first write call to DDL log
        handler_type => handler_name
        no => num
      sql/table.cc:
        Loads of review comments fixed
        inactivate => deactivate
        table log => ddl log
        Commented on Error Inject Module added
        Put various #defines into enums
        Fixed abort_and_upgrade_lock, removed unnecessary parameter
        Fixed mysqlish method intro's
        Fixed warning statements
        5.1.7 was released still with partition states in clear text
        
        Fixed io_size bug
        Fixed bug in open that TRUNCATED before reading :)
        file_entry => file_entry_buf
        Don't open DDL log until first write call to DDL log
        handler_type => handler_name
        no => num
      f298ddd8
  5. 14 Mar, 2006 1 commit
    • unknown's avatar
      BUG#15961: After review fixes · a91046af
      unknown authored
      New error message
      
      
      sql/share/errmsg.txt:
        New error message
      sql/sql_partition.cc:
        New error message
      a91046af
  6. 10 Mar, 2006 1 commit
    • unknown's avatar
      Bug#17261 Passing a variable from a stored procedure to UDF crashes mysqld · 46b56fd0
      unknown authored
       - Update of test toolsand Makefiles to make it possible to test always test udf's as part 
      of the mysql test suite
      
      
      mysql-test/mysql-test-run.pl:
        Add the path where mysqld will udf_example.so used by the udf test
      mysql-test/r/udf.result:
        Update test results
      mysql-test/t/udf.test:
        Update tests
        The "--error 0" directives should actually be changed to the correct error number returned but that error  number is lost. W e do however get the right error message and that is checked in 
        the .result file.
      sql/Makefile.am:
        Build shared library udf_example.so
      sql/share/errmsg.txt:
        Update the max length of %s string from 64 to 128
      sql/sql_udf.cc:
        Add DBUG_PRINT just before dl_open
      sql/udf_example.cc:
        Use isalpha instade of my_isalpha
      46b56fd0
  7. 08 Mar, 2006 1 commit
    • unknown's avatar
      Bug #17497: Partitions: crash if add partition on temporary table · 18d143af
      unknown authored
        Temporary tables are no longer allowed to be partitioned.
      
      
      mysql-test/r/partition.result:
        Add result
      mysql-test/t/partition.test:
        Add new regression test
      sql/share/errmsg.txt:
        Add new error message
      sql/sql_table.cc:
        Don't allow creating temporary table with partitions
      18d143af
  8. 01 Mar, 2006 1 commit
  9. 25 Feb, 2006 1 commit
    • unknown's avatar
      WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement), · 55d8e31e
      unknown authored
      and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
      in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
      SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
      the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
      It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
      TEMPORARY TABLE was not binlogged so temp table is not known on slave),  or if NDB is enabled (because
      NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
      The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
      including in prepared statements and in stored procedures and functions.
      Caveats:
      a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
      always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
      b) for the same reason, changing the thread's binlog format inside a stored function is
      refused with an error message.
      c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
      Dmitri).
      Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
      which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
      (not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
      set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
      phantom protection).
      Plus fixes for compiler warnings.
      
      
      mysql-test/r/rpl_row_4_bytes.result:
        update
      mysql-test/t/rpl_row_4_bytes.test:
        don't influence next tests
      sql/ha_archive.cc:
        please pay attention to this structure when you change it...
      sql/ha_berkeley.cc:
        please pay attention to this structure when you change it...
      sql/ha_blackhole.cc:
        please pay attention to this structure when you change it...
      sql/ha_federated.cc:
        please pay attention to this structure when you change it...
      sql/ha_heap.cc:
        please pay attention to this structure when you change it...
      sql/ha_innodb.cc:
        please pay attention to this structure when you change it...
      sql/ha_myisam.cc:
        please pay attention to this structure when you change it...
      sql/ha_myisammrg.cc:
        please pay attention to this structure when you change it...
      sql/ha_ndbcluster_binlog.cc:
        no more global 'binlog_row_based'
      sql/ha_partition.cc:
        please pay attention to this structure when you change it...
      sql/handler.cc:
        please pay attention to this structure when you change it...
      sql/handler.h:
        it's good to initialize statically (to get no compiler warning) even if to a null value.
      sql/item_func.cc:
        UDFs require row-based if this is the "mixed" binlog format.
      sql/item_strfunc.cc:
        UUID() requires row-based binlogging if this is the "mixed" binlog format
      sql/log.cc:
        binlog_row_based -> thd->current_stmt_binlog_row_based
      sql/log.h:
        the enum enum_binlog_format moves to log.h from mysqld.cc as we need it in several places.
      sql/log_event.cc:
        binlog_row_based -> thd->current_stmt_binlog_row_based
      sql/log_event.h:
        this global variable not used anymore
      sql/mysql_priv.h:
        these global variables not used anymore
      sql/mysqld.cc:
        simplification in the handling of --binlog-format (but with no user-visible change), thanks to
        the new global system variable.
        RBR does not anymore turn on --log-bin-trust-function-creators and --innodb-locks-unsafe-for-binlog
        as these are global options and RBR is now settable per session.
      sql/partition_info.cc:
        compiler warnings
      sql/set_var.cc:
        new class of thread's variable, to handle the binlog_format (like sys_var_thd_enum except
        that is_readonly() is overriden for more checks before update).
        compiler warnings (ok'd by Serg)
      sql/set_var.h:
        new class for the thread's binlog_format (see set_var.cc)
      sql/share/errmsg.txt:
        some messages for when one can't toggle from one binlog format to another
      sql/sp_head.cc:
        binlog_row_based -> thd->current_stmt_binlog_row_based
      sql/sql_base.cc:
        binlog_row_based -> thd->current_stmt_binlog_row_based
      sql/sql_class.cc:
        When a THD is initialized, we set its current_stmt_binlog_row_based
      sql/sql_class.h:
        new THD::variables.binlog_format (the value of the session variable set by SET
        or inherited from the global value), and THD::current_stmt_binlog_row_based which tells if the
        current statement does row-based or statement-based binlogging. Both members are needed
        as the 2nd one cannot be derived only from the first one (the statement's type plays a role too),
        and the 1st one is needed to reset the 2nd one.
      sql/sql_delete.cc:
        binlog_row_based -> thd->current_stmt_binlog_row_based
      sql/sql_insert.cc:
        binlog_row_based -> thd->current_stmt_binlog_row_based
      sql/sql_load.cc:
        binlog_row_based -> thd->current_stmt_binlog_row_based.
      sql/sql_parse.cc:
        when we are done with a statement, we reset the current_stmt_binlog_row_based to the value
        derived from THD::variables.binlog_format.
      sql/sql_partition.cc:
        compiler warning
      sql/sql_show.cc:
        compiler warning
      sql/sql_table.cc:
        binlog_row_based -> thd->current_stmt_binlog_row_based
      tests/mysql_client_test.c:
        compiler warning
      mysql-test/r/ndb_binlog_basic2.result:
        new result
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        new result
      mysql-test/t/ndb_binlog_basic2.test:
        new test to verify that if cluster is enabled, can't change binlog format on the fly.
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        test to see if one can switch between SBR, RBR, and "mixed" mode, and when one cannot,
        and test to see if the switching, and the mixed mode, work properly (using UUID() to test,
        as using UDFs is not possible in the testsuite for portability reasons).
      55d8e31e
  10. 23 Feb, 2006 1 commit
  11. 22 Feb, 2006 1 commit
  12. 20 Feb, 2006 2 commits
    • unknown's avatar
      A new error message for deprecated statements. · 62f52fce
      unknown authored
      Fixes failing sp.test
      
      
      mysql-test/r/backup.result:
        A new error message for deprecated statements.
      mysql-test/t/sp.test:
        Disable warnings in the test for Bug#13012
      sql/share/errmsg.txt:
        A new error message for deprecated statements.
      sql/sql_yacc.yy:
        Use a better worded error message.
      62f52fce
    • unknown's avatar
      fix for bug #16411 Events: Microsecond intervals are allowed · a2b5573d
      unknown authored
      WL#1034
      
      
      mysql-test/r/events.result:
        output fix
      sql/event.cc:
        - handle also INTERVAL_MICROSECOND, was missing.
        - use renamed ER_ code which is generic
      sql/event.h:
        add new error code
      sql/event_executor.cc:
        - use new ER_ code name
        - handle EVEX_MICROSECOND_UNSUP error code
      sql/event_timed.cc:
        forbid MICROSECOND intervals for events
      sql/share/errmsg.txt:
        rename error code, it's generic
      sql/sql_show.cc:
        use new error code name
      sql/sql_yacc.yy:
        bail out if any MICROSECOND interval is specified
      a2b5573d
  13. 17 Feb, 2006 2 commits
    • unknown's avatar
      Bug #17210 Create temp table call to ha_ndbcluster::create_handler_files caused core · bf1dab24
      unknown authored
        - do not try to create ndb temp tables even if default storage is ndb
      
      
      mysql-test/r/ndb_temporary.result:
        New BitKeeper file ``mysql-test/r/ndb_temporary.result''
      mysql-test/t/ndb_temporary.test:
        New BitKeeper file ``mysql-test/t/ndb_temporary.test''
      bf1dab24
    • unknown's avatar
      WL#2645 (CHECK TABLE FOR UPGRADE) · 437afc71
      unknown authored
      necessary implementation in the server
      mysql_upgrade script added
      
      
      client/mysqlcheck.c:
        --check-upgrade option added
      include/my_base.h:
        errcode added
      include/myisam.h:
        option added
      scripts/Makefile.am:
        mysql_upgrade script added
      sql/handler.cc:
        checks for old types/bugs added
      sql/handler.h:
        declarations regarding checks for upgrade
      sql/lex.h:
        sym added
      sql/share/errmsg.txt:
        error message added
      sql/slave.cc:
        now ha_repair is for public use
      sql/sql_table.cc:
        upgrade in ha_repair implemented
      sql/sql_yacc.yy:
        CHECK ... FOR UPGRADE added to syntax
      437afc71
  14. 14 Feb, 2006 2 commits
    • unknown's avatar
      post-merge fixes of bug 16548 · 4f448160
      unknown authored
      mysql-test/r/events.result:
        post-merge fixes
      mysql-test/t/events.test:
        post-merge fixes
      sql/event.cc:
        post-merge fixes
      sql/share/errmsg.txt:
        post-merge fixes
      sql/table.cc:
        post-merge fixes
      4f448160
    • unknown's avatar
      - final fixes for bug#16431 (Events: An event which alters itself disappears) · ccad166d
      unknown authored
      - fix for bug#16423 (Events: SHOW CREATE EVENT doesn't work)
      - this Changeset commits makes CREATE/UPDATE/DELETE EVENT real DDL statements
        by committing the currently open transaction before they are executed.
      - this Changeset also fixes a trailing space problem since the very early days
        of the internal cron
      - adds sophisticated checking of whether mysql.event was tampered accidentally
        or with purpose by an user.
      - adds a lot of inline function documentation - documents everything left
        uncodumented
      - INTERVAL_XXXX to XXX in I_S.EVENTS.INTERVAL_FIELD
      
      WL#1034 (Internal CRON)
      
      
      mysql-test/r/events.result:
        update result
      mysql-test/t/events.test:
        add test cases for SHOW CREATE EVENT
        add test cases where the structure of mysql.event is changed and error reporting in this case
      sql/event.cc:
        - do a lot more checking on mysql.event whether it's valid
          introduced generic function table_check_intact() which can be used also
          for checking whether a system table (mysql.*) has been tampered by user
          and report an error in this case. The checking is quite strict, thus
          maybe some mechanism can be added later that loosens this like some
          session variable, for instance, i_am_aware_that_i_can_damage_my_data
          so the table will be opened nevertheless we think that it's not valid.
        - add evex_show_create_event(THD *thd, sp_name *spn, LEX_STRING definer)
        - document a loooot. not a single function left undocumented.
      sql/event.h:
        - add evex_show_create_event(THD *thd, sp_name *spn, LEX_STRING definer)
        - change get_show_create_event() to get_create_event()
        - add TABLE_FIELD_W_TYPE used by table_check_intact()
        - add event_timed::sql_mode so it can be used by show create event. currently
          always 0, will be fixed by a patch for another bug. At least makes the code
          of show create event complete.
      sql/event_executor.cc:
        - add evex_check_system_tables() that checks on boot and event
          main thread startup that mysql.db and mysql.user tables are correct.
        - document everything!
      sql/event_priv.h:
        remove a line
      sql/event_timed.cc:
        - implement SHOW CREATE EVENT
        - document undocumented functions!
      sql/share/errmsg.txt:
        - fix an error message and add two new
      sql/sql_acl.cc:
        - add mysql.db table definition to use by table_check_intact()
        - exchange some of the positions by numbers from mysql.db to enum names (see sql_acl.h)
      sql/sql_acl.h:
        - define the structure of mysql.db table
      sql/sql_parse.cc:
        - handle SQLCOM_SHOW_CREATE_EVENT
        - end the current transaction becase CREATE/UPDATE/DELETE EVENT is a DDL
          statement
      sql/sql_show.cc:
        - remove interval_type_to_name
        - use common function event_reconstruct_interval_expression()
          that reconstructs the expression given at create/alter, to some
          extent - interval of 2:62 MINUTE_SECOND will be reconstructed as
          interval of 3:02 MINUTE_SECOND!
      sql/sql_yacc.yy:
        init the definer of event_timed also when doing SHOW CREATE EVENT
        because it's needed for checking into mysql.event
      sql/table.cc:
        - remove stale code. only mysql.event should be a 'system_table'
        - add table_check_intact() to check the consistency of a table.
          mostly usable with mysql.xxx tables.
      sql/table.h:
        - export TABLE_FIELD_W_TYPE and table_check_intact() which are used for 
          checking the structure of a table. mostly usable for mysql.xxx tables.
      ccad166d
  15. 09 Feb, 2006 3 commits
    • unknown's avatar
      WL 2826: Error handling of ALTER TABLE for partitioning · 749bb8dd
      unknown authored
      A number of fixes
      
      
      sql/handler.h:
        A numbre of fixes
      sql/mysql_priv.h:
        A numbre of fixes
      sql/share/errmsg.txt:
        A numbre of fixes
      sql/sql_partition.cc:
        A numbre of fixes
      sql/sql_table.cc:
        A numbre of fixes
      749bb8dd
    • unknown's avatar
      Fixed BUG#9680: Wrong error from cascading update · 24cea201
      unknown authored
        Applied 9680.patch (by Osku Salerma)
      
      24cea201
    • unknown's avatar
      Fixed BUG#16896: Stored function: unused AGGREGATE-clause in CREATE FUNCTION · dcd5b5ac
      unknown authored
        Check if AGGREGATE was given with a stored (non-UDF) function, and return
        error in that case.
        Also made udf_example/udf_test work again, by adding a missing *_init()
        function. (_init() functions required unless --allow_suspicious_udfs is
        given to the server, since March 2005 - it seems udf_example wasn't updated
        at the time.)
      
      
      mysql-test/r/sp-error.result:
        Updated results for BUG#16896.
      mysql-test/t/sp-error.test:
        Added test case for BUG#16896.
      sql/share/errmsg.txt:
        New error message: ER_SP_NO_AGGREGATE
      sql/sql_yacc.yy:
        Check if AGGREGATE was used when creating a stored function (i.e. not an UDF).
      sql/udf_example.cc:
        Added myfunc_int_init() function to make it work when the server is running without
        --allow_suspicious_udfs.
      dcd5b5ac
  16. 07 Feb, 2006 1 commit
    • unknown's avatar
      fixes for the ER_CANT_OPEN_LIBRARY message · 96f67234
      unknown authored
      sql/share/errmsg.txt:
        .64s is too short for dlerror() messages
      sql/sql_plugin.cc:
        1. dlerror() cannot be called twice
        2. remove dlpath from dlerror() messages
      96f67234
  17. 06 Feb, 2006 1 commit
  18. 26 Jan, 2006 2 commits
    • unknown's avatar
      fix for bug#16434 (Events: Illegal dates don't cause errors) · 50c6b016
      unknown authored
      (post-review commit)
      WL#1034 (Internal CRON)
      
      
      sql/event_timed.cc:
        remove bogus check
      sql/share/errmsg.txt:
        change error messages
      sql/sql_yacc.yy:
        handle error code returned by event_timed::init_starts()
      50c6b016
    • unknown's avatar
      fix for bug#16419 (Events: can't use timestamp in the schedule) · 666e0a1c
      unknown authored
      WL #1034 (Internal CRON)
      
      
      mysql-test/r/events.result:
        update test result
      mysql-test/t/events.test:
        add tests
      sql/event_timed.cc:
        - remove stupid check of val_int()
        - fix for bug #16419 (Events: can't use timestamp in the schedule)
          => don't use val_int() but only get_date() and use the date!
      sql/share/errmsg.txt:
        - fix an error message, one more "einen"
      sql/sql_yacc.yy:
        - handle new return value of event_timed::init_execute_at()
      666e0a1c
  19. 23 Jan, 2006 1 commit
  20. 19 Jan, 2006 1 commit
    • unknown's avatar
      WL1019: complete patch. Reapplied patch to the clean · f7bf702b
      unknown authored
      tree to get rid of multiple typos in CS comments and
      unify the patch.
      
      
      configure.in:
        CSV is compiled in by default now
      include/my_base.h:
        add new ha_extra flag for the log tables
      mysql-test/include/im_check_os.inc:
        we should only run im tests if csv is on for now: im relies
        on mysqld options available only in csv build.
      mysql-test/include/system_db_struct.inc:
        check log tables structure
      mysql-test/lib/init_db.sql:
        create log tables when running tests.
      mysql-test/mysql-test-run.pl:
        Add old logs flag to IM tests. As IM could only deal with
        old logs (this feature is not needed with log tables)
      mysql-test/r/connect.result:
        update result
      mysql-test/r/csv.result:
        update result
      mysql-test/r/im_utils.result:
        update result
      mysql-test/r/information_schema.result:
        update result
      mysql-test/r/mysqlcheck.result:
        update result
      mysql-test/r/show_check.result:
        update result
      mysql-test/r/system_mysql_db.result:
        update result
      mysql-test/t/connect.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/csv.test:
        add tests for concurrent insert (the functionality is added
        to CSV in this patch)
      mysql-test/t/information_schema.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/mysqlcheck.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/show_check.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/system_mysql_db.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/system_mysql_db_fix.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      scripts/mysql_create_system_tables.sh:
        new system tables: slow_log and general_log
      scripts/mysql_fix_privilege_tables.sql:
        add new log tables: use an SP to create them for
        non-csv build to work fine.
      sql/ha_myisam.cc:
        move locking-related checks to the hanlder
      sql/ha_myisam.h:
        new function declared
      sql/handler.h:
        new virtual function is added: we should check for handler-related
        locking issues in the handler
      sql/lock.cc:
        from now on we check for handler-related locking issues
        in the handler itself rather then in lock.cc
      sql/log.cc:
        Add log tables support, refactoring: there are log event
        handlers with common interface. They are used by the LOGGER
        class, which is responsible for their initialization, cleanup
        and managment. Logging to the tables provided by one of the
        log event handler types.
      sql/log.h:
        declare new log classes
      sql/log_event.cc:
        convert old logging routines calls to use new API
      sql/mysql_priv.h:
        define common log routines and objects
      sql/mysqld.cc:
        Add support for the log tables. Their initalization, cleanup
        and specific options.
      sql/share/errmsg.txt:
        add new error messages for the log tables
      sql/slave.cc:
        convert old logging routines calls to use new API
      sql/sql_base.cc:
        TABLE objects used by the logger should be skipped
        during refreshes (as log tables are always opened
        and locked). fix table_is_used to skip them.  This
        is needed for FLUSH LOGS to work
      sql/sql_db.cc:
        convert old logging routines calls to use new API
      sql/sql_delete.cc:
        fix TRUNCATE to work with log tables
      sql/sql_parse.cc:
        command_name is now an array of LEX_STRINGs
      sql/sql_prepare.cc:
        convert old logging routines calls to use new API
      sql/sql_show.cc:
        convert old logging routines calls to use new API
      sql/sql_table.cc:
        don't reoped the log tables for admin purposes
      sql/table.cc:
        mark log tables as such during the open
      sql/table.h:
        add log-related info
      storage/csv/ha_tina.cc:
        add support for concurrent insert (see bk commit - 5.1 tree
        (petr:1.1910) for standalone patch), add log tables-specific
        csv table handling.
      storage/csv/ha_tina.h:
        enable concurrent insert for CSV, add log table flag
      mysql-test/r/log_tables.result:
        New BitKeeper file ``mysql-test/r/log_tables.result''
      mysql-test/t/log_tables.test:
        New BitKeeper file ``mysql-test/t/log_tables.test''
      f7bf702b
  21. 18 Jan, 2006 2 commits
    • unknown's avatar
      - fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON) · 82cefa00
      unknown authored
      Before the interval expression was considered to be in seconds, now it is
      just a number and the type of interval is considered.
      
      - this changeset introduces also fix for bug#16432 (Events: error re interval
        misrepresents the facts)
        the code of event_timed::set_interval() was refactored anyway so it is meaningful to
        fix the bug in the same changeset.
      
      
      include/my_time.h:
        - move enum interval_type to include/my_time.h so it can be used by functions
          in the whole server
      sql/event.cc:
        - don't use second_part
        - fix small problem with create event xyz, when xyz exists -> make it error
          instead of warning if create_if_not is false.
      sql/event.h:
        pass thd to mark_last_executed() to be able to call thd->end_time()
      sql/event_executor.cc:
        - pass thd to event_timed::compute_next_execution_time()
        - a bit more DBUG info in the server log
        - handle error returned by event_timed::compute_next_execution_time()
      sql/event_priv.h:
        - define the maximal possible value for interval_value
      sql/event_timed.cc:
        - more docs
        - add static get_next_time() which sums a TIME with an interval
        - fix bug #16435 (Weekly events execute every second)
        Before the interval expression was considered to be in seconds, now it is
        just a number and the type of interval is considered.
        - fix for bug#16432 (Events: error re interval misrepresents the facts)
          (return an error if a value is too big or is negative - errmsg changed)
      sql/item_timefunc.cc:
        - export get_interval_date()
        - refactor Item_date_add_interval::get_date() and extract the core
          to date_add_interval() in time.cc so it can be reused by the
          scheduler code in event_timed.cc
      sql/item_timefunc.h:
        - export get_interval_value() so it can be reused in event_timed.cc in
          function static get_next_time()
        - move enum interval_type to include/my_time.h so it can be used by functions
          in the whole server
      sql/mysql_priv.h:
        export the new function date_add_interval() added to time.cc
      sql/share/errmsg.txt:
        - change error message to be appropriate as fix for bug#16432
          (Events: error re interval misrepresents the facts)
      sql/sql_yacc.yy:
        - change error message to be appropriate as fix for bug#16432
          (Events: error re interval misrepresents the facts)
      sql/time.cc:
        extract the core of Item_date_add_interval::get_date()
        to a function per Serg's request. The code can be reused
        to add und substract interval from a date.
      82cefa00
    • unknown's avatar
      bug #15910 (Wrong value on error message) · fe7927e6
      unknown authored
      sql/ha_partition.cc:
        using llstr to covert lonlong to string
      sql/share/errmsg.txt:
        %ld to %s
      fe7927e6
  22. 17 Jan, 2006 2 commits
    • unknown's avatar
      Bug#15206: "Misleading message "No data to FETCH": · 4fee3b1c
      unknown authored
      reword the misleading message.
      
      
      mysql-test/r/sp-error.result:
        Test results fixed (Bug#15206)
      mysql-test/r/sp.result:
        Test results fixed (Bug#15206)
      mysql-test/r/type_decimal.result:
        Disable an unportable test case (Bug#7670)
      mysql-test/r/variables.result:
        Test results fixed (Bug#15206)
      mysql-test/r/view_grant.result:
        Test results fixed (Bug#15206)
      mysql-test/t/type_decimal.test:
        Remove an unportable (QNX) test case (Bug#7670). The test output
        depends on system-specific sprintf() implementation.
        The original complain was about erroneous conversion to long long,
        which was applied prior to conversion to double: but the expected
        behaviour can't be achieved until we have an own string -> double
        conversion function.
      4fee3b1c
    • unknown's avatar
      WL #2604: Partition Management · b770b9bf
      unknown authored
      Optimised version of ADD/DROP/REORGANIZE partitions for
      non-NDB storage engines.
      New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
      Quite a few bug fixes
      
      
      include/thr_lock.h:
        New method to downgrade locks from TL_WRITE_ONLY
        Possibility to upgrade lock while aborting locks
      mysql-test/r/ndb_autodiscover.result:
        Fix for lowercase and that all NDB tables are now partitioned
      mysql-test/r/ndb_bitfield.result:
        Fix for lowercase and that all NDB tables are now partitioned
      mysql-test/r/ndb_gis.result:
        Fix for lowercase and that all NDB tables are now partitioned
      mysql-test/r/ndb_partition_key.result:
        New test case
      mysql-test/r/partition.result:
        New test case
      mysql-test/r/partition_error.result:
        New test case
      mysql-test/r/partition_mgm_err.result:
        Fix of test case results
      mysql-test/t/disabled.def:
        partition_03ndb still has bug
      mysql-test/t/ndb_partition_key.test:
        New test cases for new functionality and bugs
      mysql-test/t/partition.test:
        New test cases for new functionality and bugs
      mysql-test/t/partition_error.test:
        New test cases for new functionality and bugs
      mysql-test/t/partition_mgm_err.test:
        New test cases for new functionality and bugs
      mysys/thr_lock.c:
        New method to downgrade TL_WRITE_ONLY locks
        Possibility to specify if locks are to be upgraded at abort locks
      sql/ha_archive.cc:
        New handlerton methods
      sql/ha_berkeley.cc:
        New handlerton methods
      sql/ha_blackhole.cc:
        New handlerton methods
      sql/ha_federated.cc:
        New handlerton methods
      sql/ha_heap.cc:
        New handlerton methods
      sql/ha_innodb.cc:
        New handlerton methods
      sql/ha_myisam.cc:
        New handlerton methods
      sql/ha_myisammrg.cc:
        New handlerton methods
      sql/ha_ndbcluster.cc:
        New handlerton methods
        Moved out packfrm and unpackfrm methods
        Adapted many parts to use table_share instead of table->s
        Ensured that .ndb file uses filename and not tablename
        according to new encoding of names (WL 1324)
        All NDB tables are partitioned and set up partition info
        Fixed such that tablenames use tablenames and not filenames in NDB
        NDB uses auto partitioning for ENGINE=NDB tables
        Warning for very large tables
        Set RANGE data
        Set LIST data
        New method to set-up partition info
        Set Default number of partitions flag
        Set linear hash flag
        Set node group array
        Set number of fragments
        Set max rows
        Set tablespace names
        New method to get number of partitions of table to use at open table
      sql/ha_ndbcluster.h:
        Removed partition_flags and alter_table_flags from handler class
        A couple of new and changed method headers
      sql/ha_ndbcluster_binlog.cc:
        Use new method headers
      sql/ha_partition.cc:
        New handlerton methods
        Lots of new function headers
        Use #P# as separator between table name and partition name and
        #SP# as separator between partition name and subpartition name
        Use filename encoding for files both of table name part and of
        partition name parts
        New method to drop partitions based on partition state
        New method to rename partitions based on partition state
        New methods to optimize, analyze, check and repair partitions
        New methods to optimize, analyze, check and repair table
        Helper method to create new partition, open it and external lock
        it, not needed to lock it internally since no one else knows about
        it yet.
        Cleanup method at error for new partitions
        New methods to perform bulk of work at ADD/REORGANIZE partitions
        (change_partitions, copy_partitions)
      sql/ha_partition.h:
        New methods and variables
        A few dropped ones and a few changed ones
      sql/handler.cc:
        Handlerton interface changes
        New flag to open_table_from_share
      sql/handler.h:
        New alter_table_flags
        New partition flags
        New partition states
        More states for default handling
        Lots of new, dropped and changed interfaces
      sql/lex.h:
        Added REBUILD and changed name of REORGANISE to REORGANIZE
      sql/lock.cc:
        Method to downgrade locks
        Able to specify if locks upgraded on abort locks
      sql/log.cc:
        New handlerton methods
      sql/mysql_priv.h:
        Lots of new interfaces
      sql/share/errmsg.txt:
        Lots of new, dropped and changed error messages
      sql/sql_base.cc:
        Adapted to new method headers
        New method to abort and upgrade lock
        New method to close open tables and downgrade lock
        New method to wait for completed table
      sql/sql_lex.h:
        New flags
      sql/sql_partition.cc:
        Return int instead of bool in get_partition_id
        More defaults handling
        Make use of new mem_alloc_error method
        More work on function headers
        Changes to generate partition syntax to cater for intermediate
        partition states
        Lots of new code with large comments describing new features for
        Partition Management:
        ADD/DROP/REORGANIZE/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
      sql/sql_show.cc:
        Minors
      sql/sql_table.cc:
        Moved a couple of methods
        New methods to copy create lists and key lists
        for use with mysql_prepare_table
        New method to write frm file
        New handling of handlers with auto partitioning
        Fix CREATE TABLE LIKE
        Moved code for ADD/DROP/REORGANIZE partitions
        Use handlerton method for alter_table_flags
      sql/sql_yacc.yy:
        More memory alloc error checks
        New syntax for REBUILD, ANALYZE, CHECK, OPTIMIZE, REPAIR partitions
      sql/table.cc:
        Fix length of extra part to be 4 bytes
        Partition state introduced in frm file
      sql/table.h:
        Partition state introduced
      sql/unireg.cc:
        Partition state introduced
        Default partition
      storage/csv/ha_tina.cc:
        New handlerton methods
      storage/example/ha_example.cc:
        New handlerton methods
      storage/ndb/include/kernel/ndb_limits.h:
        RANGE DATA
      storage/ndb/include/kernel/signaldata/AlterTable.hpp:
        New interfaces in ALTER TABLE towards NDB kernel
      storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
        New section
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Lots of new parts of table description
      storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
        tablespace id specified in LQHFRAGREQ
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Lots of new methods in NDB dictionary
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        Lots of new variables in table description
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Lots of new variables in table description
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Lots of new variables in table description
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        New error insertion
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        a few extra jam's
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        Changes to definition of blob tables
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        Lots of new stuff in NDB dictionary
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Lots of new stuff in NDB dictionary
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Lots of new stuff in NDB dictionary
      storage/ndb/test/ndbapi/test_event.cpp:
        removed use of methods no longer in existence
      storage/ndb/tools/restore/Restore.cpp:
        Renamed variable
      b770b9bf
  23. 12 Jan, 2006 1 commit
    • unknown's avatar
      WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX · e1ee55a7
      unknown authored
      NDB cluster is not fully supported. This will be added with
      WL 1892 (NDB Handler: Add support for CREATE/DROP INDEX).
      Some preparatory code for this is already present though.
      A change for the "duplicate key" error message is planned
      for another changeset.
      
      
      include/my_base.h:
        WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
        Defined a mask of flags which must be the same for two indexes
        if they should compare as compatible.
        Added an error number for a new drop index error message.
      mysql-test/r/key.result:
        WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
        The test result.
      mysql-test/t/key.test:
        WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
        The test case.
      sql/handler.cc:
        WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
        Prepared for a later change in an error message:
        Replace index number by index name for "duplicate key" error.
        Added handling for the new drop index error message.
      sql/handler.h:
        WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
        Added new flags and methods.
        Removed old flags and methods (from the last attempt).
      sql/share/errmsg.txt:
        WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
        Added a new error message for drop index.
      sql/sql_table.cc:
        WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
        Moved definitions to the top of the file.
        In mysql_prepare_table() allow an index to have the name
        "PRIMARY" if it has the key type "Key::PRIMARY".
        Added a parenthesis for readability.
        Removed old code from the last attempt.
        Some changes to compare_tables():
        - Input parameter "List<Key> *key_list" is replaced by
          "KEY *key_info_buffer, uint key_count".
        - Output parameters added: "index_drop_buffer/index_drop_count"
          and "index_add_buffer/index_add_count".
        - Key comparison must now find matching keys in changed
          old and new key lists.
        - Key comparison of a key is easier now because both old
          and new keys are of type 'KEY'.
        Call mysql_prepare_table() before compare_tables(). The
        translated KEY structs are needed at some places now.
        Inserted a code segment for checking alter_table_flags().
        Removed mysql_prepare_table() from the 'partition' branches
        (it is done above now).
        Removed a pair of unnecessary braces.
        Inserted a code segment for executing fast add/drop index.
        Made close of table dependent on whether it was opened.
        Prepared for NDB cluster support.
        Fixed commit to be called outside of LOCK_open.
      e1ee55a7
  24. 11 Jan, 2006 3 commits
    • unknown's avatar
      Fixing BUG#15658: Server crashes after creating function as empty string · 30f493a0
      unknown authored
        Empty strings (and names with trailing spaces) should not be allowed.
      
      
      mysql-test/r/sp-error.result:
        New testcase for BUG#15658
      mysql-test/t/sp-error.test:
        New testcase for BUG#15658
      sql/share/errmsg.txt:
        New error message for bad stored routine names.
      sql/sp_head.cc:
        Added function for checking SP names. (Mustn't be empty or contain trailing spaces.)
      sql/sp_head.h:
        Added function for checking SP names.
      sql/sql_yacc.yy:
        Check db and name for stored routines.
      30f493a0
    • unknown's avatar
      WL #1034 (Internal CRON) pre-push fixes · a2b2f6d5
      unknown authored
      after another merge fixes.
      
      
      mysql-test/r/information_schema.result:
        WL #1034 (Internal CRON)
        fix result
      mysql-test/r/mysqlcheck.result:
        WL #1034 (Internal CRON)
        fix result
      mysql-test/r/sp.result:
        WL #1034 (Internal CRON)
        fix result
      sql/event.cc:
        after fixes for WL1012 fix these to be able to compile
      sql/event_timed.cc:
        after fixes for WL1012 fix these to be able to compile
      sql/share/errmsg.txt:
        readd error messages removed during manual update
      sql/sql_yacc.yy:
        fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
        merge. The merge wasn't good :(
      a2b2f6d5
    • unknown's avatar
      wl2723 - ndb opt. nr · 7bdcf080
      unknown authored
      mysql-test/t/rpl_multi_engine.test:
        merge fix
      libmysqld/sql_tablespace.cc:
        New BitKeeper file ``libmysqld/sql_tablespace.cc''
      mysql-test/r/ndb_basic_disk.result:
        New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
      mysql-test/t/ndb_basic_disk.test:
        New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
      sql/sql_tablespace.cc:
        New BitKeeper file ``sql/sql_tablespace.cc''
      storage/ndb/src/kernel/blocks/OptNR.txt:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
      storage/ndb/src/kernel/vm/mem.txt:
        New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
      storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
      storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
      storage/ndb/tools/ndb_error_reporter:
        New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''
      7bdcf080
  25. 10 Jan, 2006 2 commits
    • unknown's avatar
      WL #1034 (Internal CRON) pre-push update · 6e6e57d1
      unknown authored
      fix errmsg.txt
      
      
      sql/share/errmsg.txt:
        fix errmsg.txt so being able to build it
      6e6e57d1
    • unknown's avatar
      errmsg.txt: · b87963d7
      unknown authored
        Fix word.
        (no test results needed fixing)
      
      
      sql/share/errmsg.txt:
        Fix word.
        (no test results needed fixing)
      b87963d7
  26. 28 Dec, 2005 3 commits
    • unknown's avatar
      WL #1034 update · 942cebe4
      unknown authored
      - fix problem with too long identifier name
      
      
      sql/event.cc:
        report an error when identifier too long
      sql/event_priv.h:
        name the enum
        fix truncation problem
      sql/share/errmsg.txt:
        new error message
      sql/sql_yacc.yy:
        remove debug info and whitespace
      942cebe4
    • unknown's avatar
      WL #1034 update · 183ab590
      unknown authored
      - enable/disable -> enabled/disabled
      - fixed error message
      
      
      sql/lex.h:
        change ENABLE to ENABLED and DISABLE to DISABLED in 
        create/alter event
      sql/share/errmsg.txt:
        fix error msg
      sql/sql_yacc.yy:
        ENABLE -> ENABLED
        DISABLE -> DISABLED
      183ab590
    • unknown's avatar
      WL #1034 (update) · 20a65bf3
      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
      20a65bf3
  27. 22 Dec, 2005 1 commit
    • unknown's avatar
      WL#1012: All changes as one single changeset. · 00d4af11
      unknown authored
      This includes both code and test cases.
      
      
      BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
        Delete: mysql-test/r/ctype_ucs_binlog.result
      BitKeeper/deleted/.del-rpl_delete_all.result~7c050d592614b3f:
        Delete: mysql-test/r/rpl_delete_all.result
      BitKeeper/deleted/.del-rpl000013-slave.opt~18266ad8a2403e8d:
        Delete: mysql-test/t/rpl000013-slave.opt
      BitKeeper/deleted/.del-rpl_delete_all.test~700a1490277780e0:
        Delete: mysql-test/t/rpl_delete_all.test
      mysql-test/extra/binlog_tests/binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/blackhole.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_cp932.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_ddl.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_loaddata_m.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_log.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_reset_slave.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_000001.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_EE_err.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_user_variables.test:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_binlog.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_blackhole.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_ctype_cp932.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_drop_tmp_tbl.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_insert_select.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_000012.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_000015.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_deadlock_innodb.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_flushlog_loop.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_loaddata_s.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_000001.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_EE_err.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_charset.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_ddl.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_err_ignoredtable.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_loaddata_m.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_log.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_max_relay_size.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_multi_query.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_mystery22.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_reset_slave.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_rewrt_db.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_sp.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_timezone.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_until.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_user_variables.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_view.result:
        Import patch wl1012.patch
      mysql-test/t/binlog_row_binlog-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_000012.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015-slave.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015.slave-mi:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_deadlock_innodb-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-master.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-slave.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata_s-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata_s.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_000001-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_err_ignoredtable-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_loaddata_m-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_log-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_log-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_mystery22.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_rewrt_db-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_rewrt_db.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone-slave.opt:
        Import patch wl1012.patch
      BUILD/SETUP.sh:
        Import patch wl1012.patch
      Makefile.am:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_until.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_view.test:
        Import patch wl1012.patch
      client/Makefile.am:
        Import patch wl1012.patch
      client/client_priv.h:
        Import patch wl1012.patch
      client/mysqlbinlog.cc:
        Import patch wl1012.patch
      configure.in:
        Import patch wl1012.patch
      include/Makefile.am:
        Import patch wl1012.patch
      include/base64.h:
        Import patch wl1012.patch
      include/config-win.h:
        Import patch wl1012.patch
      include/my_base.h:
        Import patch wl1012.patch
      include/my_global.h:
        Import patch wl1012.patch
      mysql-test/Makefile.am:
        Import patch wl1012.patch
      mysql-test/mysql-test-run.pl:
        Import patch wl1012.patch
      mysql-test/mysql-test-run.sh:
        Import patch wl1012.patch
      mysql-test/r/date_formats.result:
        Import patch wl1012.patch
      mysql-test/r/flush_block_commit.result:
        Import patch wl1012.patch
      mysql-test/r/innodb.result:
        Import patch wl1012.patch
      mysql-test/r/rpl000017.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_change_master.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_commit_after_flush.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_create_database.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_do_grant.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_loaddata.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_log_pos.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_multi_delete.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_multi_update.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_openssl.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_replicate_do.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_rotate_logs.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_server_id1.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_server_id2.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_temporary.result:
        Import patch wl1012.patch
      mysql-test/r/user_var-binlog.result:
        Import patch wl1012.patch
      mysql-test/t/create_select_tmp.test:
        Import patch wl1012.patch
      mysql-test/t/date_formats.test:
        Import patch wl1012.patch
      mysql-test/t/disabled.def:
        Import patch wl1012.patch
      mysql-test/t/innodb.test:
        Import patch wl1012.patch
      mysql-test/t/mysqlbinlog.test:
        Import patch wl1012.patch
      mysql-test/t/mysqlbinlog2.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000002.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000006.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000013.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000017.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_auto_increment.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_change_master.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_commit_after_flush.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_create_database.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_do_grant.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_drop.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_empty_master_crash.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_failed_optimize.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_heap.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_insert_id.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_insert_ignore.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_log_pos.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_delete.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update2.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update3.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_openssl.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_redirect.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_relayrotate.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_replicate_do.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_rotate_logs.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_server_id1.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_sp_effects.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_temporary.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_trigger.test:
        Import patch wl1012.patch
      mysql-test/t/sp.test:
        Import patch wl1012.patch
      mysql-test/t/user_var-binlog.test:
        Import patch wl1012.patch
      mysys/Makefile.am:
        Import patch wl1012.patch
      mysys/base64.c:
        Import patch wl1012.patch
      sql/Makefile.am:
        Import patch wl1012.patch
      sql/ha_innodb.cc:
        Import patch wl1012.patch
      sql/ha_innodb.h:
        Import patch wl1012.patch
      sql/ha_partition.cc:
        Import patch wl1012.patch
      sql/handler.cc:
        Import patch wl1012.patch
      sql/handler.h:
        Import patch wl1012.patch
      sql/item_sum.cc:
        Import patch wl1012.patch
      sql/log.cc:
        Import patch wl1012.patch
      sql/log_event.cc:
        Import patch wl1012.patch
      sql/log_event.h:
        Import patch wl1012.patch
      sql/mysql_priv.h:
        Import patch wl1012.patch
      sql/mysqld.cc:
        Import patch wl1012.patch
      sql/rpl_filter.h:
        Import patch wl1012.patch
      sql/set_var.cc:
        Import patch wl1012.patch
      sql/share/errmsg.txt:
        Import patch wl1012.patch
      sql/slave.cc:
        Import patch wl1012.patch
      sql/slave.h:
        Import patch wl1012.patch
      sql/sp.cc:
        Import patch wl1012.patch
      sql/sp_head.cc:
        Import patch wl1012.patch
      sql/sql_acl.cc:
        Import patch wl1012.patch
      sql/sql_base.cc:
        Import patch wl1012.patch
      sql/sql_class.cc:
        Import patch wl1012.patch
      sql/sql_class.h:
        Import patch wl1012.patch
      sql/sql_delete.cc:
        Import patch wl1012.patch
      sql/sql_insert.cc:
        Import patch wl1012.patch
      sql/sql_lex.h:
        Import patch wl1012.patch
      sql/sql_list.h:
        Import patch wl1012.patch
      sql/sql_load.cc:
        Import patch wl1012.patch
      sql/sql_parse.cc:
        Import patch wl1012.patch
      sql/sql_plugin.cc:
        Import patch wl1012.patch
      sql/sql_rename.cc:
        Import patch wl1012.patch
      sql/sql_repl.h:
        Import patch wl1012.patch
      sql/sql_select.cc:
        Import patch wl1012.patch
      sql/sql_show.cc:
        Import patch wl1012.patch
      sql/sql_table.cc:
        Import patch wl1012.patch
      sql/sql_udf.cc:
        Import patch wl1012.patch
      sql/sql_union.cc:
        Import patch wl1012.patch
      sql/sql_update.cc:
        Import patch wl1012.patch
      sql/sql_yacc.yy:
        Import patch wl1012.patch
      sql/table.cc:
        Import patch wl1012.patch
      sql/table.h:
        Import patch wl1012.patch
      storage/innobase/include/lock0lock.h:
        Import patch wl1012.patch
      storage/innobase/include/row0mysql.h:
        Import patch wl1012.patch
      storage/innobase/include/row0vers.h:
        Import patch wl1012.patch
      storage/innobase/lock/lock0lock.c:
        Import patch wl1012.patch
      storage/innobase/row/row0mysql.c:
        Import patch wl1012.patch
      storage/innobase/row/row0sel.c:
        Import patch wl1012.patch
      storage/innobase/row/row0vers.c:
        Import patch wl1012.patch
      00d4af11