3463 jonas oreland 2012-02-13 [merge]
ndb - merge 5.1.57 into 6.3
removed:
include/my_handler.h
mysys/my_gethostbyname.c
mysys/my_handler.c
mysys/my_port.c
added:
include/my_compare.h
mysql-test/include/not_crashrep.inc
mysql-test/r/func_encrypt_ucs2.result
mysql-test/r/ssl_cipher.result
mysql-test/suite/innodb/r/innodb_bug60049.result
mysql-test/suite/innodb/t/innodb_bug60049-master.opt
mysql-test/suite/innodb/t/innodb_bug60049.test
mysql-test/suite/innodb_plugin/r/innodb_bug59307.result
mysql-test/suite/innodb_plugin/r/innodb_bug60049.result
mysql-test/suite/innodb_plugin/t/innodb_bug59307.test
mysql-test/suite/innodb_plugin/t/innodb_bug60049-master.opt
mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
mysql-test/t/func_encrypt_ucs2.test
mysql-test/t/ssl_cipher-master.opt
mysql-test/t/ssl_cipher.test
mysys/my_compare.c
win/build-vs10.bat
win/build-vs10_x64.bat
modified:
.bzrignore
CMakeLists.txt
README
client/client_priv.h
client/mysqlbinlog.cc
client/mysqldump.c
client/mysqlslap.c
client/mysqltest.cc
configure.in
extra/perror.c
extra/yassl/src/yassl_int.cpp
include/Makefile.am
include/heap.h
include/my_bit.h
include/my_bitmap.h
include/my_global.h
include/myisam.h
libmysql/CMakeLists.txt
libmysql/Makefile.shared
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/rpl_tests/rpl_conflicts.test
mysql-test/extra/rpl_tests/rpl_extra_col_master.test
mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
mysql-test/extra/rpl_tests/rpl_loaddata.test
mysql-test/extra/rpl_tests/rpl_record_compare.test
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
mysql-test/extra/rpl_tests/type_conversions.test
mysql-test/include/mix1.inc
mysql-test/include/mtr_warnings.sql
mysql-test/lib/mtr_report.pm
mysql-test/r/analyse.result
mysql-test/r/archive.result
mysql-test/r/cast.result
mysql-test/r/ctype_cp1250_ch.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_cp932_binlog_stm.result
mysql-test/r/ctype_eucjpms.result*
mysql-test/r/ctype_sjis.result
mysql-test/r/ctype_ucs.result
mysql-test/r/ddl_i18n_koi8r.result
mysql-test/r/ddl_i18n_utf8.result
mysql-test/r/events_bugs.result
mysql-test/r/func_group.result
mysql-test/r/func_math.result
mysql-test/r/func_time.result
mysql-test/r/gis.result
mysql-test/r/group_by.result
mysql-test/r/insert_select.result
mysql-test/r/lock_sync.result
mysql-test/r/lowercase_table2.result
mysql-test/r/mysqlbinlog.result
mysql-test/r/mysqldump.result
mysql-test/r/mysqlslap.result
mysql-test/r/order_by.result
mysql-test/r/packet.result
mysql-test/r/partition.result
mysql-test/r/shm.result
mysql-test/r/show_check.result
mysql-test/r/sp-destruct.result
mysql-test/r/variables-notembedded.result
mysql-test/r/variables.result
mysql-test/r/view.result
mysql-test/r/xml.result
mysql-test/suite/binlog/r/binlog_base64_flag.result
mysql-test/suite/binlog/r/binlog_row_binlog.result
mysql-test/suite/binlog/r/binlog_stm_binlog.result
mysql-test/suite/binlog/t/binlog_base64_flag.test
mysql-test/suite/binlog/t/binlog_index.test
mysql-test/suite/engines/iuds/r/insert_year.result
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
mysql-test/suite/innodb/t/innodb_bug53756.test
mysql-test/suite/innodb_plugin/t/innodb_bug53756.test
mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
mysql-test/suite/rpl/r/rpl_binlog_corruption.result
mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result
mysql-test/suite/rpl/r/rpl_bug33931.result
mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
mysql-test/suite/rpl/r/rpl_idempotency.result
mysql-test/suite/rpl/r/rpl_ignore_table.result
mysql-test/suite/rpl/r/rpl_incident.result
mysql-test/suite/rpl/r/rpl_init_slave_errors.result
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
mysql-test/suite/rpl/r/rpl_loaddata.result
mysql-test/suite/rpl/r/rpl_loaddata_concurrent.result
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/r/rpl_rotate_logs.result
mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
mysql-test/suite/rpl/r/rpl_row_colSize.result
mysql-test/suite/rpl/r/rpl_row_conflicts.result
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result
mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
mysql-test/suite/rpl/r/rpl_skip_error.result
mysql-test/suite/rpl/r/rpl_slave_grp_exec.result
mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
mysql-test/suite/rpl/r/rpl_stm_conflicts.result
mysql-test/suite/rpl/r/rpl_temporary_errors.result
mysql-test/suite/rpl/t/rpl_binlog_corruption.test
mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test
mysql-test/suite/rpl/t/rpl_bug33931.test
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
mysql-test/suite/rpl/t/rpl_idempotency.test
mysql-test/suite/rpl/t/rpl_ignore_table.test
mysql-test/suite/rpl/t/rpl_incident.test
mysql-test/suite/rpl/t/rpl_init_slave_errors.test
mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
mysql-test/suite/rpl/t/rpl_loaddata_fatal.test
mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt
mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt
mysql-test/suite/rpl/t/rpl_rotate_logs.test
mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
mysql-test/suite/rpl/t/rpl_row_colSize.test
mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test
mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
mysql-test/suite/rpl/t/rpl_skip_error.test
mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
mysql-test/suite/rpl/t/rpl_temporary_errors.test
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_gap_event.result
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test
mysql-test/t/analyse.test
mysql-test/t/archive.test
mysql-test/t/cast.test
mysql-test/t/crash_commit_before.test
mysql-test/t/ctype_cp1250_ch.test
mysql-test/t/ctype_cp1251.test
mysql-test/t/ctype_cp932_binlog_stm.test
mysql-test/t/ctype_eucjpms.test
mysql-test/t/ctype_sjis.test
mysql-test/t/ctype_ucs.test
mysql-test/t/events_bugs.test
mysql-test/t/func_group.test
mysql-test/t/func_math.test
mysql-test/t/func_time.test
mysql-test/t/gis.test
mysql-test/t/group_by.test
mysql-test/t/insert_select.test
mysql-test/t/lock_sync.test
mysql-test/t/lowercase_table2.test
mysql-test/t/myisam_crash_before_flush_keys.test
mysql-test/t/mysqlbinlog.test
mysql-test/t/mysqldump.test
mysql-test/t/mysqlslap.test
mysql-test/t/order_by.test
mysql-test/t/partition.test
mysql-test/t/show_check.test
mysql-test/t/sp-destruct.test
mysql-test/t/variables-notembedded.test
mysql-test/t/variables.test
mysql-test/t/view.test
mysql-test/t/xml.test
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/my_bitmap.c
mysys/my_net.c
plugin/fulltext/plugin_example.c
scripts/make_win_bin_dist
sql/event_db_repository.cc
sql/field.h
sql/ha_partition.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/item_func.cc
sql/item_strfunc.cc
sql/item_strfunc.h
sql/item_timefunc.cc
sql/item_timefunc.h
sql/log_event.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/set_var.cc
sql/sql_analyse.cc
sql/sql_base.cc
sql/sql_connect.cc
sql/sql_parse.cc
sql/sql_prepare.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_string.h
sql/sql_table.cc
storage/archive/ha_archive.cc
storage/innobase/include/sync0arr.h
storage/innobase/srv/srv0srv.c
storage/innobase/sync/sync0arr.c
storage/innodb_plugin/ChangeLog
storage/innodb_plugin/btr/btr0btr.c
storage/innodb_plugin/btr/btr0cur.c
storage/innodb_plugin/btr/btr0sea.c
storage/innodb_plugin/buf/buf0buf.c
storage/innodb_plugin/buf/buf0lru.c
storage/innodb_plugin/dict/dict0mem.c
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/include/btr0btr.h
storage/innodb_plugin/include/btr0types.h
storage/innodb_plugin/include/buf0buf.h
storage/innodb_plugin/include/dict0mem.h
storage/innodb_plugin/include/page0zip.h
storage/innodb_plugin/include/sync0arr.h
storage/innodb_plugin/include/univ.i
storage/innodb_plugin/page/page0cur.c
storage/innodb_plugin/page/page0page.c
storage/innodb_plugin/page/page0zip.c
storage/innodb_plugin/row/row0upd.c
storage/innodb_plugin/srv/srv0srv.c
storage/innodb_plugin/srv/srv0start.c
storage/innodb_plugin/sync/sync0arr.c
storage/innodb_plugin/sync/sync0rw.c
storage/innodb_plugin/trx/trx0i_s.c
storage/myisam/ft_stopwords.c
storage/myisam/mi_check.c
storage/myisam/mi_create.c
storage/myisam/mi_test1.c
storage/myisam/mi_write.c
storage/myisam/myisamdef.h
storage/myisam/sp_test.c
strings/xml.c
tests/mysql_client_test.c
unittest/mysys/bitmap-t.c
3462 jonas oreland 2012-01-02
ndb - anual fix of ctype_cp932_binlog_stm
modified:
mysql-test/t/ctype_cp932_binlog_stm.test
Diff too large for email (12951 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-telco-6.3 branch (jonas.oreland:3462 to 3463) | jonas oreland | 13 Feb |
