1. 30 Jan, 2004 1 commit
  2. 29 Jan, 2004 1 commit
  3. 26 Jan, 2004 1 commit
  4. 21 Jan, 2004 1 commit
    • unknown's avatar
      Fixed BUG#2227: Server crash with stored procedure call. · 219f51b4
      unknown authored
      (Meaning "... with SELECT v", where v is a local variable.)
      
      
      mysql-test/r/sp.result:
        Test case for BUG#2227
      mysql-test/t/sp.test:
        Test case for BUG#2227
      sql/item.h:
        Item_splocal::send() needed for "SELEC v", where "v" is a local variable.
        Also set the field name.
      sql/sp_head.cc:
        Have to get decimals and max_length right for reals, when SELECT of local variables.
      219f51b4
  5. 20 Jan, 2004 1 commit
  6. 19 Jan, 2004 1 commit
  7. 14 Jan, 2004 3 commits
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 95a34bd8
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      95a34bd8
    • unknown's avatar
      Fixed BUG#2267: Lost connect if stored procedure has SHOW FUNCTION STATUS. · b6b947d6
      unknown authored
      (This might not be enough, could be more statements that must be detected...)
      
      
      mysql-test/r/sp.result:
        Test case for BUG#2267
      mysql-test/t/sp.test:
        Test case for BUG#2267
      sql/sp.cc:
        Code clean-up: Get the correct order of print-outs in debug trace.
      sql/sql_yacc.yy:
        Detect "select-like" statements so that the multi result flag is set correctly.
      b6b947d6
    • unknown's avatar
      Fixed BUG#2329: Crash if insert with variable name in stored procedure. · 61207881
      unknown authored
      Found a few more places in the parser (insert, replace and update) where
      local stored procedure variables should not be recognized.
      
      
      mysql-test/r/sp-error.result:
        Test cases for BUG#2329
      mysql-test/r/sp.result:
        New test case for certain context dependencies for symbols.
      mysql-test/t/sp-error.test:
        Test cases for BUG#2329
      mysql-test/t/sp.test:
        New test case for certain context dependencies for symbols.
      sql/sql_yacc.yy:
        Found a few more places where local SP variables should not be recognized.
      61207881
  8. 09 Jan, 2004 1 commit
    • unknown's avatar
      Fix BUG#2269: Lost connect if stored procedure called before USE · b0928683
      unknown authored
      (And some minor correction of cursor open)
      
      
      sql/sp_head.cc:
        Detect some errors that doesn't result in a non-zero return code in
        the SP execution loop.
        (Also corrected the cursor post_open() call.)
      sql/sp_rcontext.cc:
        Corrected the semantics of cursor post_open().
      sql/sp_rcontext.h:
        Corrected the semantics of cursor post_open().
      b0928683
  9. 08 Jan, 2004 3 commits
    • unknown's avatar
      Fix BUG#2260: Handler NOT FOUND declaration does't work in stored procedure · 03b652cf
      unknown authored
      
      mysql-test/r/sp.result:
        Test case for BUG#2260.
      mysql-test/t/sp.test:
        Test case for BUG#2260.
      sql/sp_rcontext.cc:
        Detect warning and not found, and exception condition correctly.
      03b652cf
    • unknown's avatar
      Fix BUG#2259: Crash after fetch from not-open cursor in stored procedure · 02753573
      unknown authored
      Initialize and test properly when cleaning up, to avoid crash in some error cases.
      
      
      mysql-test/r/sp-error.result:
        Test case for BUG#2259
      mysql-test/t/sp-error.test:
        Test case for BUG#2259
      sql/sp_rcontext.cc:
        Cleanup in a more controlled way to avoid crashes in some error cases.
        Remove unused variable.
      sql/sp_rcontext.h:
        Initialize member var, for cleanup tests.
      02753573
    • unknown's avatar
      Fix BUG#2272: Crash if update with variable name in stored procedure. · 952e2cd4
      unknown authored
      Parse column names (and not variables) only in UPDATE ... SET ...
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#2272
      mysql-test/t/sp-error.test:
        New test case for BUG#2272
      sql/sql_yacc.yy:
        "UPDATE table SET id = val" should only recognize column names, and not
        local SP variables for 'id'.
        (Also removed "as locator" syntax which is not supported.)
      952e2cd4
  10. 22 Dec, 2003 1 commit
  11. 21 Dec, 2003 8 commits
    • unknown's avatar
      Merge mysql.com:/my/mysql-4.1 into mysql.com:/my/mysql-5.0 · 9385323d
      unknown authored
      
      client/mysqltest.c:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      9385323d
    • unknown's avatar
      Fixed bug in replacation for not x86 platforms · 46a9b87a
      unknown authored
      Portability fixes
      
      
      mysql-test/r/rpl_relayrotate.result:
        Portability fix
      mysql-test/t/rpl_relayrotate.test:
        Portability fix.
      sql/log_event.cc:
        Removed ++ from uint4korr() becasue this caused side effects
      sql/uniques.cc:
        Removed not used argument to get_merge_buffers_cost()
        Removed wrong cast which caused compiler failures
        Cast arguments to ceil() to double (portability problem)
      46a9b87a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 73846938
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      73846938
    • unknown's avatar
      Portability fixes found during 5.0 test compilation · d31c6628
      unknown authored
      Fixed bug in ORDER BY on a small column (Bug #2147)
      Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
      
      
      
      client/mysqltest.c:
        Added handling of error on query send
        (Needed for init_connection.test)
      mysql-test/mysql-test-run.sh:
        Added tracing of mysqldump and mysqlbinlog
      mysql-test/r/init_connect.result:
        Updated tests
      mysql-test/r/order_by.result:
        Added test for bug filesort bug
      mysql-test/t/init_connect-master.opt:
        Added proper quoting (for Solaris and OSF)
      mysql-test/t/init_connect.test:
        Portability fix
      mysql-test/t/order_by.test:
        Added test for bug #2147 (bug in filesort)
      sql/filesort.cc:
        Fixed bug in filesort (Bug #2147)
      sql/item.h:
        Clear 'fixed' on cleanup (For prepared statements)
      sql/item_func.cc:
        Protect mutex destroy.
        (Fixed error from pthread_mutex_destroy() when one had wrong errmsg file)
      sql/log_event.cc:
        Portability fix
      sql/sql_class.h:
        Fixed compiler warning
      sql/sql_prepare.cc:
        Portability fix. (Some compilers doesn't support jump over variables declared in for())
      d31c6628
    • unknown's avatar
      Portability fix · 92339e10
      unknown authored
      92339e10
    • unknown's avatar
      Fixed memory leaks in SP · c466a191
      unknown authored
      Some code cleanup
      
      
      mysql-test/r/sp.result:
        Update results after adding quotes around function/procedure names
      sql/sp.cc:
        Moved DBUG_ENTER after all variable declarations
        Eliminated some variables.
        Added more DBUG_ENTER commands.
        Added memory allocation checking in create_string()
        Fixed memory leak in sp_show_create_function()
        Removed usage of sprintf
      sql/sql_parse.cc:
        Simple cleanup
        Fixed memory leaks for mailformed SP definitions
      c466a191
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 292bb8cb
      unknown authored
      into mysql.com:/my/mysql-5.0
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      292bb8cb
    • unknown's avatar
      Update for VC++ · 4f72061f
      unknown authored
      (Fixed project files, compiler warnings etc..)
      
      
      BitKeeper/etc/ignore:
        added mysql_priv.h
      VC++Files/libmysqld/libmysqld.dsp:
        Update for VC++to
      VC++Files/sql/mysqld.dsp:
        Update for VC++
      client/mysqlbinlog.cc:
        Remove not used variable
      sql-common/client.c:
        Fix for compilation with VC++
      sql/filesort.cc:
        Remove not used variable
      sql/item_timefunc.cc:
        Fixed compiler warnings
      sql/log_event.cc:
        Fixed compiler warnings
        - One can't portable allocate an stack-array dynamicly
        - Changed sql_mode to ulong to match THD.variables.sql_mode (If they are not the same we get a lot of compiler warnings)
      sql/log_event.h:
        Changed sql_mode to ulong to match THD.variables.sql_mode (If they are not the same we get a lot of compiler warnings)
      sql/sp.cc:
        sql_mode to ulong
        Don't use strcpy
        Replaced sprintf() with strmov
      sql/sp_cache.cc:
        Fixed compiler warning
      sql/sp_head.cc:
        Removed not used variable
      sql/sp_rcontext.cc:
        Removed not used variable
      sql/sp_rcontext.h:
        Fixed compiler warning
      sql/sql_class.cc:
        Portability fix
      sql/sql_delete.cc:
        Fixed compiler warning
      sql/sql_insert.cc:
        Fixed compiler warning
      sql/sql_update.cc:
        Fixed compiler warning
      4f72061f
  12. 20 Dec, 2003 8 commits
    • unknown's avatar
      Merge mysql.com:/home/pem/work/mysql-4.1 · 5c1ee928
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0-merge
      
      
      5c1ee928
    • unknown's avatar
      Post-merge fixes. · 3fa541df
      unknown authored
      3fa541df
    • unknown's avatar
      Merge 4.1 to 5.0 (the prep stmt fixes in particular). · 495082a6
      unknown authored
      
      libmysqld/lib_sql.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      495082a6
    • unknown's avatar
      univ.i, srv0srv.c: · b4b8d1f6
      unknown authored
        Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms
      
      
      innobase/srv/srv0srv.c:
        Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms
      innobase/include/univ.i:
        Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms
      b4b8d1f6
    • unknown's avatar
      srv0start.c, univ.i, configure.in: · 9e56a0a7
      unknown authored
        Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
      
      
      innobase/configure.in:
        Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
      innobase/include/univ.i:
        Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
      innobase/srv/srv0start.c:
        Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
      9e56a0a7
    • unknown's avatar
      Merge fix · d5708aeb
      unknown authored
      d5708aeb
    • unknown's avatar
      Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe · 65c44414
      unknown authored
      A after merge fix for last merge
      
      
      innobase/btr/btr0btr.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/btr/btr0sea.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/buf/buf0buf.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/buf/buf0flu.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/buf/buf0lru.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/buf/buf0rea.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/com/com0shm.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/data/data0data.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/data/data0type.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/dict/dict0crea.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/dict/dict0dict.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/fil/fil0fil.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/fsp/fsp0fsp.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/fut/fut0lst.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/ha/ha0ha.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/ibuf/ibuf0ibuf.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/include/univ.i:
        Disabled ut_sprintf/ut_fprintf. Not needed as all number arguments to printf are now casted
      innobase/lock/lock0lock.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/log/log0log.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/log/log0recv.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/mem/mem0dbg.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/mem/mem0pool.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/mtr/mtr0log.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/mtr/mtr0mtr.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/os/os0file.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/os/os0sync.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/page/page0cur.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/page/page0page.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/read/read0read.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/rem/rem0cmp.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/rem/rem0rec.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/row/row0mysql.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
        Heikki, please check the change of % to %%
      innobase/row/row0sel.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/row/row0undo.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/srv/srv0srv.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/srv/srv0start.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/sync/sync0arr.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/sync/sync0rw.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/sync/sync0sync.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0purge.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0rec.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0roll.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0sys.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0trx.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0undo.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/usr/usr0sess.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/ut/ut0mem.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/ut/ut0ut.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      sql/sql_delete.cc:
        After merge fix
      65c44414
    • unknown's avatar
      one line was removed during merge · 28f7dbdb
      unknown authored
      28f7dbdb
  13. 19 Dec, 2003 10 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · e622f6fb
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format
      
      
      sql/ha_innodb.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      e622f6fb
    • unknown's avatar
      Now merge is done. · bc3cbfbc
      unknown authored
      For previous commit I had run only rpl* tests, here the other ones had a 
      few surprises. Latest status:
      - all tests pass
      - all replication tests pass with Valgrind
      This is the final-final commit & push.
      Doc remains.
      
      
      client/mysqlbinlog.cc:
        Making remote mysqlbinlog work with the new format of 5.0.0, and still be 
        able to talk to older servers.
        This is a quickfix, but now mysqlbinlog.test passes (mysqlbinlog seems to
        work in Valgrind, too).
      mysql-test/r/drop_temp_table.result:
        result update
      mysql-test/r/insert_select.result:
        result update
      mysql-test/r/mix_innodb_myisam_binlog.result:
        result update
      mysql-test/r/mysqlbinlog.result:
        result update
      mysql-test/t/mix_innodb_myisam_binlog.test:
        position update
      mysql-test/t/mysqlbinlog.test:
        position update
      sql/log_event.cc:
        a comment (noticed the problem by watching the results of
        mix_innodb_myisam_binlog.test)
      bc3cbfbc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e87a2b31
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-prep_st_hack
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      e87a2b31
    • unknown's avatar
      Prepared_statement deployed instead of PREP_STMT. · 32c6b0d7
      unknown authored
      
      libmysqld/lib_sql.cc:
        Prepared_statement now resides entirely in sql_prepare.cc
        Embedded versions of setup_params_data moved to sql_prepare.cc
      sql/mysql_priv.h:
        removed declarations for non-existing functions
      sql/slave.cc:
        no thd->init_for_queries() any more
      sql/sql_class.cc:
        added Statement and Statement_map classes.
        PREP_STMT replaced with Statement (Prepared_statement) and moved to
        sql_prepare.cc
      sql/sql_class.h:
        added Statement and Statement_map classes.
        PREP_STMT replaced with Statement (Prepared_statement) and moved to
        sql_prepare.cc
      sql/sql_parse.cc:
        thd->init_for_queries() doesn't exist any more
        comment moved to proper place
      sql/sql_prepare.cc:
        PREP_STMT replaced with Prepared_statement
        minor code cleanups
      tests/client_test.c:
        Later in the test we rely on order of rows, which normally is not defined.
        My patch changes the order.
      32c6b0d7
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5084b6b7
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format
      
      
      include/my_sys.h:
        Auto merged
      mysql-test/r/rpl_max_relay_size.result:
        Auto merged
      mysql-test/r/rpl_rotate_logs.result:
        Auto merged
      mysql-test/r/rpl_trunc_binlog.result:
        Auto merged
      mysql-test/t/rpl_log_pos.test:
        Auto merged
      mysql-test/t/rpl_max_relay_size.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/rpl_trunc_binlog.test:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      5084b6b7
    • unknown's avatar
      Merge mysql.com:/home/psergey/mysql-5.0-latest-pull · c0d9d437
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-5.0-imerge-unique
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/my_global.h:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/records.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/uniques.cc:
        Auto merged
      c0d9d437
    • unknown's avatar
      28ad1273
    • unknown's avatar
      This is the final commit for Worklog tasks: · 62554f81
      unknown authored
         * A more dynamic binlog format which allows small changes (1064)
         * Log session variables in Query_log_event (1063)
      It contains a few bugfixes (which I made when running the testsuite).
      I carefully updated the results of the testsuite (i.e. I checked for every one,
      if the difference between .reject and .result could be explained).
      Apparently mysql-test-run --manager is broken in 4.1 and 5.0 currently,
      so I could neither run the few tests which require --manager, nor check
      that they pass nor modify their .result. But for builds, we don't run
      with --manager.
      Apart from --manager, the full testsuite passes, with Valgrind too (no errors).
      I'm going to push in the next minutes. Remains: update the manual.
      Note: by chance I saw that (in 4.1, in 5.0) rpl_get_lock fails when run alone;
      this is normal at it makes assumptions on thread ids. I will fix this one day
      in 4.1.
      
      
      mysql-test/r/rpl000015.result:
        result update
      mysql-test/r/rpl_change_master.result:
        result update
      mysql-test/r/rpl_error_ignored_table.result:
        result update
      mysql-test/r/rpl_flush_log_loop.result:
        result update
      mysql-test/r/rpl_flush_tables.result:
        result update
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/r/rpl_loaddata_rule_m.result:
        result update
      mysql-test/r/rpl_loaddata_rule_s.result:
        result update
      mysql-test/r/rpl_log.result:
        result update
      mysql-test/r/rpl_log_pos.result:
        result update
      mysql-test/r/rpl_max_relay_size.result:
        result update
      mysql-test/r/rpl_relayrotate.result:
        result update
      mysql-test/r/rpl_replicate_do.result:
        result update
      mysql-test/r/rpl_reset_slave.result:
        result update
      mysql-test/r/rpl_rotate_logs.result:
        result update
      mysql-test/r/rpl_session_var.result:
        result update
      mysql-test/r/rpl_temporary.result:
        result update
      mysql-test/r/rpl_trunc_binlog.result:
        result update
      mysql-test/r/rpl_until.result:
        result update
      mysql-test/r/rpl_user_variables.result:
        result update
      mysql-test/t/rpl000010-slave.opt:
        need to wait 2 events, because now we receive a Format_desc on top of the Rotate,
        when replication starts.
      mysql-test/t/rpl000015.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_change_master.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_empty_master_crash.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_error_ignored_table.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_flush_log_loop.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_loaddata.test:
        position update
      mysql-test/t/rpl_loaddata_rule_m.test:
        position update
      mysql-test/t/rpl_loaddata_rule_s.test:
        position update
      mysql-test/t/rpl_log.test:
        position update
      mysql-test/t/rpl_log_pos.test:
        position update
      mysql-test/t/rpl_max_relay_size.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_openssl.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_redirect.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_relayrotate-slave.opt:
        better options for this test
      mysql-test/t/rpl_relayrotate.test:
        using max() is better for debugging (it shows at which place the slave
        SQL thread resumed)
      mysql-test/t/rpl_replicate_do.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_reset_slave.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_rotate_logs.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_session_var.test:
        100 because password() is longer than 10 chars
      mysql-test/t/rpl_trunc_binlog.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_until.test:
        position update
      mysql-test/t/rpl_user_variables.test:
        position update
      sql/log.cc:
        Ensure that the Format_desc propagated on next relay logs does not trigger
        undue actions (like incrementing some positions or clearing some files).
      sql/log_event.cc:
        * When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
        a transaction (then these were written by the slave itself to its relay log),
        it should not increment rli->group* variables, but only rli->event* ones.
        * When the slave SQL thread finds a Format_desc not to be ignored (not
        the same server id as the slave's), if it has log_pos==0 it must not trigger
        "unfinished transaction in master's binlog" (log_pos==0 is always a marker
        in the relay log to mean "this event was not at this place in the master's
        binlog": it's for fake Rotate events, and for Format_description events which the master had
        to send us for replication to start).
        * In the Query_log_event on disk, catalog is now terminated by '\0'.
        * thd->catalog must be set to 0 when some exec_event() terminate (otherwise
        double free).
      sql/slave.cc:
        * Fixes for a few bugs when ignoring events in the slave SQL thread:
          - do not decrement rli->slave_skip_counter if the event is an event
          related to the binlog or relay log itself (FORMAT_DESCRIPTION,
          ROTATE, STOP) because these events should never be skipped (or the slave
          will be confused). Usually the user wants to skip a query, not a Rotate... 
          - when we (re)connect to the master, we must free description_event_for_queue
          (otherwise memory leak when we reconnect). 
        * Changed a bit the code where we change description_event_for_queue,
        to make it look "safer".
        * Moved 'created=0' to log.cc where it is safer.
        * When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
        a transaction (then these were written by the slave itself to its relay log),
        it should not increment rli->group* variables, but only rli->event* ones.
      sql/sql_class.h:
        a warning comment
      sql/sql_repl.cc:
        A mistake: I had passed a char* instead of char**
      62554f81
    • unknown's avatar
      Post merge fix. · b41e6294
      unknown authored
      b41e6294
    • unknown's avatar
      Merging lex-pointer change from 4.1 to 5.0. · 24e886a3
      unknown authored
      
      libmysqld/lib_sql.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_error.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      24e886a3