Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into selena.:H:/MYSQL/src/#13377-mysql-5.0 mysql-test/include/check_var_limit.inc: Auto merged mysql-test/include/have_big5.inc: Auto merged mysql-test/include/have_compress.inc: Auto merged mysql-test/include/have_crypt.inc: Auto merged mysql-test/include/have_outfile.inc: Auto merged mysql-test/include/have_query_cache.inc: Auto merged mysql-test/include/have_tis620.inc: Auto merged mysql-test/include/have_ucs2.inc: Auto merged mysql-test/include/have_ujis.inc: Auto merged mysql-test/include/not_embedded.inc: Auto merged mysql-test/include/system_db_struct.inc: Auto merged mysql-test/include/test_outfile.inc: Auto merged mysql-test/r/greedy_optimizer.result: Auto merged mysql-test/r/index_merge.result: Auto merged mysql-test/r/index_merge_bdb.result: Auto merged mysql-test/r/index_merge_innodb.result: Auto merged mysql-test/r/index_merge_innodb2.result: Auto merged mysql-test/r/index_merge_ror.result: Auto merged mysql-test/r/index_merge_ror_cpk.result: Auto merged mysql-test/r/join_nested.result: Auto merged mysql-test/r/rowid_order_bdb.result: Auto merged mysql-test/r/rowid_order_innodb.result: Auto merged mysql-test/r/rpl_session_var.result: Auto merged mysql-test/r/sp-error.result: Auto merged mysql-test/r/sp-security.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/sum_distinct.result: Auto merged mysql-test/std_data/des_key_file: Auto merged mysql-test/std_data/init_file.dat: Auto merged mysql-test/std_data/loaddata1.dat: Auto merged mysql-test/std_data/loaddata2.dat: Auto merged mysql-test/std_data/loaddata3.dat: Auto merged mysql-test/std_data/loaddata4.dat: Auto merged mysql-test/std_data/rpl_loaddata.dat: Auto merged mysql-test/std_data/rpl_loaddata2.dat: Auto merged mysql-test/std_data/warnings_loaddata.dat: Auto merged mysql-test/t/greedy_optimizer.test: Auto merged mysql-test/t/index_merge.test: Auto merged mysql-test/t/index_merge_bdb.test: Auto merged mysql-test/t/index_merge_innodb.test: Auto merged mysql-test/t/index_merge_innodb2.test: Auto merged mysql-test/t/index_merge_ror.test: Auto merged mysql-test/t/index_merge_ror_cpk.test: Auto merged mysql-test/t/join_nested.test: Auto merged mysql-test/t/rowid_order_bdb.test: Auto merged mysql-test/t/rowid_order_innodb.test: Auto merged mysql-test/t/rpl_session_var.test: Auto merged mysql-test/t/sp-error.test: Auto merged mysql-test/t/sp-security.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/sum_distinct.test: Auto merged sql/log.cc: Auto merged sql/slave.cc: Auto merged sql/sql_class.h: Auto merged
Showing
Please register or sign in to comment