1. 06 Dec, 2004 5 commits
  2. 04 Dec, 2004 2 commits
  3. 03 Dec, 2004 23 commits
    • unknown's avatar
      postreview fixes · 56080a8d
      unknown authored
      
      mysql-test/r/subselect_innodb.result:
        fixed result of test
      mysql-test/t/subselect_innodb.test:
        fixed test layout
      56080a8d
    • unknown's avatar
      merge · b2f7b5bd
      unknown authored
      b2f7b5bd
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · c2780e12
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
      
      
      c2780e12
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · c9f0aaa6
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      c9f0aaa6
    • unknown's avatar
      Fix t/rpl_create_database.test: replace version in SHOW BINLOG RESULTS · 67aec82f
      unknown authored
      
      mysql-test/t/rpl_create_database.test:
        need to replace version in results
      mysql-test/r/rpl_create_database.result:
        version gets replaced
      67aec82f
    • unknown's avatar
      Merge · a1fb39e7
      unknown authored
      
      sql/sql_insert.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_class.h:
        SCCS merged
      a1fb39e7
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0284e541
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      0284e541
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 3456a512
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      3456a512
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 684f91e6
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      684f91e6
    • unknown's avatar
      Due to a compiler bug, slave.cc:tables_ok() sometimes wrongly returns · f2d6046e
      unknown authored
      1 if the return type is int or int_fast8_t.  The test case that showed
      this problem is rpl000001 and the tested version was MySQL 5.0.2.  The
      compiler with the problem is GCC 3.0.4 runing on "Linux bitch 2.4.18
      #2 Thu Apr 11 14:37:17 EDT 2002 sparc64 unknown".
      
      By changing the return type to bool the problem disappear.  (Another
      way to make the problem disappear is to simply print the returned
      value with printf("%d",?).  The printed returned value is always 0 in
      the test cases I have run.)  This is only a partial solution to the
      problem, since someone could later change the return type of the
      function back to int or some other type that does not work.
      
      
      sql/slave.cc:
        Changed type
      sql/slave.h:
        Changed type
      f2d6046e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 68755d7f
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/sql_insert.cc:
        Auto merged
      68755d7f
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 390f6800
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      390f6800
    • unknown's avatar
      sql/sql_class.h · dea513dd
      unknown authored
          Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
      sql/sql_insert.cc
          Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
      
      
      sql/sql_class.h:
        Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
      sql/sql_insert.cc:
        Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
      dea513dd
    • unknown's avatar
      ndb - fix in test suite · b1f4a482
      unknown authored
      
      ndb/test/src/NDBT_Test.cpp:
        clear threads when finished waiting
      b1f4a482
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8f063cec
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      
      8f063cec
    • unknown's avatar
      ndb: failed update updated tuple version. crash at DbtupTrigger.cpp 1102 · c9215dc2
      unknown authored
      
      ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        failed update updated tuple version. crash at DbtupTrigger.cpp 1102
      c9215dc2
    • unknown's avatar
      Merge mysql.com:/home/wax/mysql/mysql-4.1 · abf0ab9e
      unknown authored
      into mysql.com:/home/wax/mysql/mysql-4.1testtemp
      
      
      abf0ab9e
    • unknown's avatar
      46596179
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · eb21ec54
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      eb21ec54
    • unknown's avatar
      ndb - fix abort of scan when in WAIT_AI_SCAN state · abb1963d
      unknown authored
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Make sure to release all resources when aborting scan
          in state WAIT_AI_SCAN
      abb1963d
    • unknown's avatar
      Merge mysql.com:/space/bkroot/mysql-4.1 · 72d56253
      unknown authored
      into mysql.com:/space/bk/b6391-mysql-4.1
      
      
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      72d56253
    • unknown's avatar
      Bug#6391 (binlog-do-db rules ignored) · 220acb32
      unknown authored
        CREATE DATABASE statement used the current database instead of the
        database created when checking conditions for replication.
        CREATE/DROP/ALTER DATABASE statements are now replicated based on
        the manipulated database.
      
      
      mysql-test/t/rpl_until.test:
        Longer sleep to allow slave to stop.
      mysql-test/t/rpl_charset.test:
        Position change in binary file.
      mysql-test/r/drop_temp_table.result:
        Position change in binlog.
      mysql-test/r/rpl_loaddata_rule_m.result:
        Position change in binlog.
      mysql-test/r/rpl_charset.result:
        Position change in binlog.
      sql/log_event.h:
        Added new flag and parameter to suppress generation of
        USE statements.
      sql/log_event.cc:
        Added parameter and code to suppress generation of
        USE statements.
      sql/sql_db.cc:
        Suppress generation of USE before CREATE/ALTER/DROP DATABASE
        statements.
      sql/log.cc:
        Query_log_event have new extra parameter.
      sql/sql_table.cc:
        Query_log_event have new extra parameter.
      sql/sql_base.cc:
        Query_log_event have new extra parameter.
      sql/sql_update.cc:
        Query_log_event have new extra parameter.
      sql/sql_insert.cc:
        Query_log_event have new extra parameter.
      sql/sql_rename.cc:
        Query_log_event have new extra parameter.
      sql/sql_delete.cc:
        Query_log_event have new extra parameter.
      sql/sql_acl.cc:
        Query_log_event have new extra parameter.
      sql/handler.cc:
        Query_log_event have new extra parameter.
      sql/item_func.cc:
        Query_log_event have new extra parameter.
      sql/sql_parse.cc:
        Query_log_event have new extra parameter.
      220acb32
    • unknown's avatar
      Manual fixes to merge of fix for Bug #6682 to 4.1. · 8948b745
      unknown authored
      
      sql/sql_class.h:
        update tmp_disable_binlog() and reenable_binlog() macros
      mysql-test/r/insert_select.result:
        Handle results that differ from 4.0 to 4.1
      8948b745
  4. 02 Dec, 2004 10 commits