1. 26 Apr, 2006 1 commit
  2. 25 Apr, 2006 14 commits
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 23669046
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      23669046
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-new · 249ff249
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      storage/ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      249ff249
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d36a35a4
      unknown authored
      into lmy004.:/work/mysql-5.1-new-clean
      
      
      mysql-test/t/disabled.def:
        Auto merged
      d36a35a4
    • unknown's avatar
      BUG#17263: incorrect DROP query in temporary tables replication · b6f42918
      unknown authored
      the fix from 5.0 with necessary modifications applied.
      
      
      sql/sql_base.cc:
        Manual merge with 5.0.
      b6f42918
    • unknown's avatar
      Merge mysql.com:/home/elkin/MySQL/BARE/5.0 · 3b6263b8
      unknown authored
      into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/case.result:
        Auto merged
      mysql-test/r/rpl_temporary.result:
        Auto merged
      mysql-test/t/case.test:
        Auto merged
      mysql-test/t/rpl_temporary.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      storage/myisam/myisam_ftdump.c:
        Auto merged
      sql/sql_base.cc:
        manual merge use local. Another changeset for 5.1 is following.
      3b6263b8
    • unknown's avatar
      BUG#19340 small leak in ndbd · 9f5cec76
      unknown authored
      small cleanup fixes in kernel/vm/Configuration
      
      
      ndb/src/kernel/vm/Configuration.cpp:
        clean up m_logLevel
        
        free the connectstring if we allocated one
      9f5cec76
    • unknown's avatar
      Post-merge fixes from 5.0. · 1e869b0e
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        Post-merge fix. Added new 5.0 test case manually.
      sql/sql_yacc.yy:
        Post-merge fix. Removed GOTO/LABEL from parser.
      1e869b0e
    • unknown's avatar
      Merge mysql.com:/extern/mysql/5.1/generic/mysql-5.0-merge · 225330cd
      unknown authored
      into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
      
      
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/timezone_grant.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      mysql-test/r/rpl_insert_id.result:
        Manual merge.
      mysql-test/t/disabled.def:
        Manual merge.
      mysql-test/t/rpl_insert_id.test:
        Manual merge.
      sql/item_func.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge - not complete yet.
      225330cd
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ea564a72
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      
      ea564a72
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · d00a6cf4
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      d00a6cf4
    • unknown's avatar
      Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 · c2911678
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      c2911678
    • unknown's avatar
      Fixed memleak detected by valgrind · e42428d5
      unknown authored
      e42428d5
    • unknown's avatar
      Manually merged · 08f93037
      unknown authored
      
      client/mysql.cc:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/t/rpl_relayrotate.test:
        Auto merged
      mysys/mf_keycache.c:
        Auto merged
      BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b:
        Auto merged
      mysql-test/t/rpl_stm_until.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/unireg.h:
        Auto merged
      storage/ndb/src/kernel/SimBlockList.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
        Auto merged
      08f93037
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c9841352
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      
      c9841352
  3. 24 Apr, 2006 24 commits
  4. 23 Apr, 2006 1 commit