1. 28 Feb, 2006 2 commits
  2. 27 Feb, 2006 17 commits
  3. 26 Feb, 2006 13 commits
    • unknown's avatar
      Trace mysqlcheck to file mysqlcheck.trcae · 3dea6246
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Let mysqlcheck have it's own trace file
      3dea6246
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7d5ac7e4
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      7d5ac7e4
    • unknown's avatar
      var/tmp does not work (same fix as knielsen did for rpl_row_UUID a few days ago) · abb176ff
      unknown authored
      
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        var/tmp does not work if non-default vardir
      abb176ff
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 15bed7c5
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      15bed7c5
    • unknown's avatar
      Look for and "convert" paths that start with $MYSQL_TMP_DIR · 399617ef
      unknown authored
      
      client/mysqltest.c:
        Also look for "$MYSQL_TMP_DIR" when looking for paths to convert
      mysql-test/mysql-test-run.pl:
        Export $MYSQL_TMP_DIR
      mysql-test/mysql-test-run.sh:
        Export $MYSQL_TMP_DIR
      399617ef
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · ac24b2b7
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
      
      
      sql/sql_table.cc:
        Auto merged
      ac24b2b7
    • unknown's avatar
      Fixed test for bug #13525 "Rename table does not keep info of triggers" · 4fb56f15
      unknown authored
      after merging fix for it with main tree.
      
      
      4fb56f15
    • unknown's avatar
      Cleanups · 422a1406
      unknown authored
      Don't run upgrade.test with embedded server as it requires mysqlcheck
      
      
      mysql-test/r/upgrade.result:
        Change database names to start with mysqltest
      mysql-test/t/upgrade.test:
        Change database names to start with mysqltest
        Don't run test with embedded server as it requires mysqlcheck
      sql/ha_ndbcluster.cc:
        Code style cleanups
        more dbugging
      sql/ha_ndbcluster_binlog.cc:
        Free table_share properly in case of errors
        More debugging
      422a1406
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 1c93eeaa
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
      
      
      sql/sql_table.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_trigger.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/trigger.result:
        SCCS merged
      mysql-test/t/trigger.test:
        SCCS merged
      1c93eeaa
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · c59ae65d
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      sql/handler.h:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      c59ae65d
    • unknown's avatar
      After merge fixes · d25c405d
      unknown authored
      
      BitKeeper/etc/ignore:
        added storage/ndb/src/common/util/testBitmask.cpp
      mysql-test/mysql-test-run.sh:
        Add libmysql_r/.libs to path for shared libraries.
        (Needed for mysqlimport)
      mysql-test/r/ctype_cp932_notembedded.result:
        After merge fix
      mysql-test/r/func_system.result:
        Version number on embedded server can be longer than 40
      mysql-test/r/partition_mgm_err.result:
        Move tests that require symlinks to partion_mgm_err2.test
      mysql-test/r/query_cache.result:
        Fix possible errors from previous tests
      mysql-test/t/ctype_cp932_notembedded.test:
        After merge fix
      mysql-test/t/func_system.test:
        Version number on embedded server can be longer than 40
      mysql-test/t/partition_mgm_err.test:
        Move tests that require symlinks to partion_mgm_err2.test
      mysql-test/t/query_cache.test:
        Fix possible errors from previous tests
      mysys/my_symlink2.c:
        More debugging
      sql/event.cc:
        Code cleanup
      sql/event_executor.cc:
        Ensure that event mutexes are properly cleared up
      sql/mysqld.cc:
        Ensure that event mutexes are properly cleared up
      mysql-test/r/partition_mgm_err2.result:
        New BitKeeper file ``mysql-test/r/partition_mgm_err2.result''
      mysql-test/t/partition_mgm_err2.test:
        New BitKeeper file ``mysql-test/t/partition_mgm_err2.test''
      d25c405d
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4eccd2ae
      unknown authored
      into  zim.(none):/home/brian/mysql/dep-5.1
      
      
      4eccd2ae
    • unknown's avatar
      This patch handles compiles with threads, namely if you don't have pthreads it... · dc936364
      unknown authored
      This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break).
      
      
      client/mysqlimport.c:
        Add in flags to support compiles with no thread support.
      client/mysqlslap.c:
        Add support to source code to compile without threads.
      dc936364
  4. 25 Feb, 2006 8 commits
    • unknown's avatar
      Fix for a segfault in my previous cset (about WL#2712 and WL#2977). · e562a201
      unknown authored
      
      sql/sql_load.cc:
        fix for segfault in my previous cset
      sql/sql_repl.cc:
        if RBR, log_loaded_block() returns immediately (code moved from sql_load.cc)
      e562a201
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9cd6325b
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-new
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      9cd6325b
    • unknown's avatar
      WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement), · 7cac0ddf
      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).
      7cac0ddf
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.0 · f7cf76fc
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      BitKeeper/deleted/.del-innodb_notembedded.test:
        Delete: mysql-test/t/innodb_notembedded.test
      BitKeeper/deleted/.del-sp_notembedded.test:
        Delete: mysql-test/t/sp_notembedded.test
      BitKeeper/deleted/.del-subselect_notembedded.test:
        Delete: mysql-test/t/subselect_notembedded.test
      BitKeeper/deleted/.del-ctype_cp932_notembedded.result:
        Delete: mysql-test/r/ctype_cp932_notembedded.result
      BitKeeper/deleted/.del-innodb_notembedded.result:
        Delete: mysql-test/r/innodb_notembedded.result
      BitKeeper/deleted/.del-sp_notembedded.result:
        Delete: mysql-test/r/sp_notembedded.result
      BitKeeper/deleted/.del-subselect_notembedded.result:
        Delete: mysql-test/r/subselect_notembedded.result
      configure.in:
        Auto merged
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/emb_qcache.cc:
        Auto merged
      libmysqld/embedded_priv.h:
        Auto merged
      libmysqld/libmysqld.c:
        Auto merged
      mysql-test/extra/binlog_tests/blackhole.test:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/query_cache_notembedded.result:
        Auto merged
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/backup.test:
        Auto merged
      mysql-test/t/compress.test:
        Auto merged
      mysql-test/t/delayed.test:
        Auto merged
      mysql-test/t/handler.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/mysql_client_test.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/query_cache_notembedded.test:
        Auto merged
      mysql-test/t/read_only.test:
        Auto merged
      mysql-test/t/skip_grants.test:
        Auto merged
      mysql-test/t/sp-destruct.test:
        Auto merged
      mysql-test/t/sp-error.test:
        Auto merged
      mysql-test/t/sp-threads.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/temp_table.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      mysql-test/t/wait_timeout.test:
        Auto merged
      mysys/mf_dirname.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/protocol.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_cursor.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/table.h:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/tztime.h:
        Auto merged
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Manual merge
      mysql-test/extra/binlog_tests/binlog.test:
        Manual merge
      mysql-test/extra/binlog_tests/ctype_cp932.test:
        No changes
      mysql-test/r/binlog_stm_binlog.result:
        Manual merge
      mysql-test/r/binlog_stm_ctype_cp932.result:
        No changes
      mysql-test/t/innodb.test:
        Manual merge
      mysql-test/t/view.test:
        Manual merge
      mysys/my_bitmap.c:
        Manual merge
      scripts/mysql_fix_privilege_tables.sql:
        Manual merge
      sql/item.cc:
        Manual merge
      sql/sql_cache.h:
        Manual merge
      sql/sql_class.h:
        Manual merge
      sql/sql_update.cc:
        Manual merge
      f7cf76fc
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.0 · 54e0c92d
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      54e0c92d
    • unknown's avatar
      Fixed compiler warnings from gcc 4.0.2: · f5f01b15
      unknown authored
      - Added empty constructors and virtual destructors to many classes and structs
      - Removed some usage of the offsetof() macro to instead use C++ class pointers
      
      
      configure.in:
        Added comment
      ndb/include/ndbapi/NdbDictionary.hpp:
        Fixed compiler warnings from gcc 4.0.2
      sql/field.cc:
        Fixed compiler warnings from gcc 4.0.2
      sql/handler.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/item.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/item_cmpfunc.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/log_event.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/mysql_priv.h:
        Fixed compiler warnings from gcc 4.0.2
        For find_table_in_list I fixed it to use proper C++ class pointers instead of C style pointers
      sql/opt_range.cc:
        Fixed compiler warnings from gcc 4.0.2
      sql/parse_file.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/sp_rcontext.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/spatial.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/sql_base.cc:
        Fixed compiler warnings from gcc 4.0.2
      sql/sql_cache.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/sql_class.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/sql_parse.cc:
        Fixed compiler warnings from gcc 4.0.2
        (Not pretty, but seams to work...)
      sql/sql_select.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/sql_update.cc:
        Fixed compiler warnings from gcc 4.0.2
      sql/table.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/tztime.cc:
        Fixed compiler warnings from gcc 4.0.2
      sql/tztime.h:
        Fixed compiler warnings from gcc 4.0.2
      f5f01b15
    • unknown's avatar
      635d5b73
    • unknown's avatar
      Fixed typo · 6436f923
      unknown authored
      
      sql/sql_db.cc:
        Move LINT_INIT() to correct place
      6436f923