List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:November 19 2010 9:22am
Subject:bzr commit into mysql-5.1-innodb branch (vasil.dimov:3659)
View as plain text  
#At file:///usr/local/devel/bzrroot/server/mysql-5.1-innodb/ based on revid:marko.makela@stripped

 3659 Vasil Dimov	2010-11-19 [merge]
      Merge mysql-5.1-bugteam -> mysql-5.1-innodb

    removed:
      mysql-test/suite/ibmdb2i/
      mysql-test/suite/ibmdb2i/include/
      mysql-test/suite/ibmdb2i/include/have_i54.inc
      mysql-test/suite/ibmdb2i/include/have_i61.inc
      mysql-test/suite/ibmdb2i/include/have_ibmdb2i.inc
      mysql-test/suite/ibmdb2i/r/
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44020.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44025.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44610.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45793.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45983.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_collations.result
      mysql-test/suite/ibmdb2i/t/
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44020.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44025.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44610.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45793.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45983.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_collations.test
      mysql-test/suite/sys_vars/README
      pstack/
      pstack/Makefile.am
      pstack/aout/
      pstack/aout/Makefile.am
      pstack/aout/aout64.h
      pstack/aout/stab.def
      pstack/aout/stab_gnu.h
      pstack/bucomm.c
      pstack/bucomm.h
      pstack/budbg.h
      pstack/debug.c
      pstack/debug.h
      pstack/demangle.h
      pstack/filemode.c
      pstack/ieee.c
      pstack/ieee.h
      pstack/libiberty.h
      pstack/linuxthreads.c
      pstack/linuxthreads.h
      pstack/pstack.c
      pstack/pstack.h
      pstack/pstacktrace.h
      pstack/rddbg.c
      pstack/stabs.c
      storage/ibmdb2i/
      storage/ibmdb2i/CMakeLists.txt
      storage/ibmdb2i/Makefile.am
      storage/ibmdb2i/db2i_blobCollection.cc
      storage/ibmdb2i/db2i_blobCollection.h
      storage/ibmdb2i/db2i_charsetSupport.cc
      storage/ibmdb2i/db2i_charsetSupport.h
      storage/ibmdb2i/db2i_collationSupport.cc
      storage/ibmdb2i/db2i_collationSupport.h
      storage/ibmdb2i/db2i_constraints.cc
      storage/ibmdb2i/db2i_conversion.cc
      storage/ibmdb2i/db2i_errors.cc
      storage/ibmdb2i/db2i_errors.h
      storage/ibmdb2i/db2i_file.cc
      storage/ibmdb2i/db2i_file.h
      storage/ibmdb2i/db2i_global.h
      storage/ibmdb2i/db2i_iconv.h
      storage/ibmdb2i/db2i_ileBridge.cc
      storage/ibmdb2i/db2i_ileBridge.h
      storage/ibmdb2i/db2i_ioBuffers.cc
      storage/ibmdb2i/db2i_ioBuffers.h
      storage/ibmdb2i/db2i_misc.h
      storage/ibmdb2i/db2i_myconv.cc
      storage/ibmdb2i/db2i_myconv.h
      storage/ibmdb2i/db2i_rir.cc
      storage/ibmdb2i/db2i_safeString.h
      storage/ibmdb2i/db2i_sqlStatementStream.cc
      storage/ibmdb2i/db2i_sqlStatementStream.h
      storage/ibmdb2i/db2i_validatedPointer.h
      storage/ibmdb2i/ha_ibmdb2i.cc
      storage/ibmdb2i/ha_ibmdb2i.h
      storage/ibmdb2i/plug.in
    added:
      mysql-test/suite/binlog/t/binlog_index-master.opt
      mysql-test/suite/rpl/t/rpl_current_user-master.opt
      mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt
      mysql-test/suite/sys_vars/t/disabled.def
      mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic-master.opt
      mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func-master.opt
      mysql-test/suite/sys_vars/t/sql_log_off_func-master.opt
    modified:
      BUILD/compile-pentium-mysqlfs-debug
      Makefile.am
      README
      cmd-line-utils/readline/bind.c
      configure.in
      include/m_string.h
      include/my_compiler.h
      include/mysql_embed.h
      libmysql/libmysql.c
      mysql-test/collections/default.weekly
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/sp-bugs.result
      mysql-test/r/variables-big.result
      mysql-test/r/xml.result
      mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
      mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/parts/inc/partition_auto_increment.inc
      mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
      mysql-test/suite/parts/r/partition_auto_increment_innodb.result
      mysql-test/suite/parts/r/partition_auto_increment_memory.result
      mysql-test/suite/parts/r/partition_auto_increment_myisam.result
      mysql-test/suite/parts/t/part_supported_sql_func_innodb.test
      mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter4_innodb.test
      mysql-test/suite/rpl/r/rpl_ignore_table.result
      mysql-test/suite/rpl/t/rpl_cross_version-master.opt
      mysql-test/suite/rpl/t/rpl_ignore_table.test
      mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh
      mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh
      mysql-test/suite/sys_vars/inc/timestamp_basic.inc
      mysql-test/suite/sys_vars/r/general_log_file_basic.result
      mysql-test/suite/sys_vars/r/general_log_func.result
      mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
      mysql-test/suite/sys_vars/r/log_output_basic.result
      mysql-test/suite/sys_vars/r/log_output_func.result
      mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
      mysql-test/suite/sys_vars/r/timestamp_basic_32.result
      mysql-test/suite/sys_vars/r/timestamp_basic_64.result
      mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
      mysql-test/suite/sys_vars/t/completion_type_func.test
      mysql-test/suite/sys_vars/t/general_log_file_basic.test
      mysql-test/suite/sys_vars/t/general_log_func.test
      mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test
      mysql-test/suite/sys_vars/t/log_output_func.test
      mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test
      mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
      mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
      mysql-test/suite/sys_vars/t/timestamp_basic_32.test
      mysql-test/suite/sys_vars/t/timestamp_basic_64.test
      mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
      mysql-test/t/disabled.def
      mysql-test/t/key_cache-master.opt
      mysql-test/t/mysqlbinlog-master.opt
      mysql-test/t/sp-bugs.test
      mysql-test/t/variables-big.test
      mysql-test/t/xml.test
      mysys/mf_keycache.c
      mysys/my_getncpus.c
      regex/regexec.c
      sql/Makefile.am
      sql/debug_sync.cc
      sql/ha_partition.cc
      sql/handler.cc
      sql/item.cc
      sql/item_func.cc
      sql/mysqld.cc
      sql/slave.cc
      sql/sp_head.cc
      sql/sql_partition.cc
      sql/sql_table.cc
      storage/myisam/ft_nlq_search.c
      storage/myisam/mi_create.c
      storage/myisammrg/myrg_open.c
      tests/mysql_client_test.c

Diff too large for email (44494 lines, the limit is 10000).
No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-5.1-innodb branch (vasil.dimov:3659) vasil.dimov19 Nov