List:Commits« Previous MessageNext Message »
From:jonas oreland Date:February 13 2012 3:31pm
Subject:bzr push into mysql-5.1-telco-6.3 branch (jonas.oreland:3465 to 3467)
View as plain text  
 3467 jonas oreland	2012-02-13 [merge]
      ndb - merge 5.1.60 into 6.3

    added:
      cmd-line-utils/libedit/chartype.c
      cmd-line-utils/libedit/chartype.h
      cmd-line-utils/libedit/eln.c
      cmd-line-utils/libedit/historyn.c
      cmd-line-utils/libedit/np/wcsdup.c
      cmd-line-utils/libedit/tokenizern.c
      mysql-test/include/have_federated_plugin.inc
      mysql-test/suite/federated/federated_plugin-master.opt
      mysql-test/suite/federated/federated_plugin.result
      mysql-test/suite/federated/federated_plugin.test
      mysql-test/suite/innodb/r/innodb_bug12661768.result
      mysql-test/suite/innodb/t/innodb_bug12661768.test
      mysql-test/suite/innodb_plugin/r/innodb_misc1.result
      mysql-test/suite/innodb_plugin/t/innodb_bug47167-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_file_format-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_misc1-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_misc1.test
    renamed:
      cmd-line-utils/libedit/el_term.h => cmd-line-utils/libedit/el_terminal.h
      cmd-line-utils/libedit/key.c => cmd-line-utils/libedit/keymacro.c
      cmd-line-utils/libedit/key.h => cmd-line-utils/libedit/keymacro.h
      cmd-line-utils/libedit/term.c => cmd-line-utils/libedit/terminal.c
    modified:
      client/mysql.cc
      client/mysqltest.cc
      cmd-line-utils/libedit/Makefile.am
      cmd-line-utils/libedit/README
      cmd-line-utils/libedit/chared.c
      cmd-line-utils/libedit/chared.h
      cmd-line-utils/libedit/common.c
      cmd-line-utils/libedit/config.h
      cmd-line-utils/libedit/el.c
      cmd-line-utils/libedit/el.h
      cmd-line-utils/libedit/emacs.c
      cmd-line-utils/libedit/filecomplete.c
      cmd-line-utils/libedit/filecomplete.h
      cmd-line-utils/libedit/hist.c
      cmd-line-utils/libedit/hist.h
      cmd-line-utils/libedit/histedit.h
      cmd-line-utils/libedit/history.c
      cmd-line-utils/libedit/makelist.sh
      cmd-line-utils/libedit/map.c
      cmd-line-utils/libedit/map.h
      cmd-line-utils/libedit/np/strlcpy.c
      cmd-line-utils/libedit/np/unvis.c
      cmd-line-utils/libedit/np/vis.c
      cmd-line-utils/libedit/np/vis.h
      cmd-line-utils/libedit/parse.c
      cmd-line-utils/libedit/parse.h
      cmd-line-utils/libedit/prompt.c
      cmd-line-utils/libedit/prompt.h
      cmd-line-utils/libedit/read.c
      cmd-line-utils/libedit/read.h
      cmd-line-utils/libedit/readline.c
      cmd-line-utils/libedit/readline/readline.h
      cmd-line-utils/libedit/refresh.c
      cmd-line-utils/libedit/refresh.h
      cmd-line-utils/libedit/search.c
      cmd-line-utils/libedit/search.h
      cmd-line-utils/libedit/sig.c
      cmd-line-utils/libedit/sig.h
      cmd-line-utils/libedit/sys.h
      cmd-line-utils/libedit/tokenizer.c
      cmd-line-utils/libedit/tty.c
      cmd-line-utils/libedit/tty.h
      cmd-line-utils/libedit/vi.c
      configure.in
      extra/innochecksum.c
      include/decimal.h
      include/heap.h
      mysql-test/include/mtr_check.sql
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/error_simulation.result
      mysql-test/r/group_by.result
      mysql-test/r/heap.result
      mysql-test/r/merge.result
      mysql-test/r/myisam.result
      mysql-test/r/myisampack.result
      mysql-test/r/mysqltest.result
      mysql-test/r/partition_innodb_plugin.result
      mysql-test/r/select_safe.result
      mysql-test/r/show_check.result
      mysql-test/r/sp_trans.result
      mysql-test/r/type_newdecimal.result
      mysql-test/r/view_grant.result
      mysql-test/suite/engines/funcs/r/de_calendar_range.result
      mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result
      mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_duplicate_update.result
      mysql-test/suite/engines/funcs/r/up_calendar_range.result
      mysql-test/suite/engines/funcs/t/de_calendar_range.test
      mysql-test/suite/engines/funcs/t/in_calendar_2_unique_constraints_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_error.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_ignore.test
      mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_duplicate_update.test
      mysql-test/suite/engines/funcs/t/up_calendar_range.test
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb_plugin/r/innodb-index.result
      mysql-test/suite/innodb_plugin/r/innodb.result
      mysql-test/suite/innodb_plugin/r/innodb_bug52745.result
      mysql-test/suite/innodb_plugin/r/innodb_bug53591.result
      mysql-test/suite/innodb_plugin/t/innodb-autoinc-18274.test
      mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
      mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228.test
      mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
      mysql-test/suite/innodb_plugin/t/innodb-create-options.test
      mysql-test/suite/innodb_plugin/t/innodb-index.test
      mysql-test/suite/innodb_plugin/t/innodb-zip.test
      mysql-test/suite/innodb_plugin/t/innodb.test
      mysql-test/suite/innodb_plugin/t/innodb_bug36172.test
      mysql-test/suite/innodb_plugin/t/innodb_bug52745.test
      mysql-test/suite/innodb_plugin/t/innodb_bug53591.test
      mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
      mysql-test/suite/innodb_plugin/t/innodb_bug59641.test
      mysql-test/suite/ndb/t/ndb_partition_error2.test
      mysql-test/suite/sys_vars/r/max_join_size_func.result
      mysql-test/suite/sys_vars/r/sql_big_selects_func.result
      mysql-test/suite/sys_vars/r/sql_max_join_size_func.result
      mysql-test/t/error_simulation.test
      mysql-test/t/group_by.test
      mysql-test/t/heap.test
      mysql-test/t/merge.test
      mysql-test/t/myisam.test
      mysql-test/t/myisampack.test
      mysql-test/t/mysqltest.test
      mysql-test/t/parser_stack.test
      mysql-test/t/partition_innodb_plugin.test
      mysql-test/t/show_check.test
      mysql-test/t/sp_trans.test
      mysql-test/t/type_newdecimal.test
      mysql-test/t/view_grant.test
      mysql-test/valgrind.supp
      scripts/mysql_install_db.pl.in
      scripts/mysql_install_db.sh
      sql/filesort.cc
      sql/handler.cc
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/my_decimal.h
      sql/rpl_rli.h
      sql/share/errmsg.txt
      sql/slave.cc
      sql/sp_head.cc
      sql/sql_base.cc
      sql/sql_cache.cc
      sql/sql_parse.cc
      sql/sql_select.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      storage/federated/Makefile.am
      storage/heap/ha_heap.cc
      storage/heap/hp_create.c
      storage/heap/hp_info.c
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/fsp0fsp.h
      storage/innobase/include/page0page.h
      storage/innobase/include/page0page.ic
      storage/innobase/include/sync0rw.h
      storage/innobase/include/sync0rw.ic
      storage/innobase/page/page0page.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0purge.c
      storage/innobase/row/row0umod.c
      storage/innobase/row/row0upd.c
      storage/innobase/sync/sync0rw.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/btr/btr0btr.c
      storage/innodb_plugin/btr/btr0cur.c
      storage/innodb_plugin/btr/btr0pcur.c
      storage/innodb_plugin/btr/btr0sea.c
      storage/innodb_plugin/buf/buf0buddy.c
      storage/innodb_plugin/buf/buf0buf.c
      storage/innodb_plugin/buf/buf0lru.c
      storage/innodb_plugin/dict/dict0crea.c
      storage/innodb_plugin/dict/dict0dict.c
      storage/innodb_plugin/fsp/fsp0fsp.c
      storage/innodb_plugin/ha/ha0ha.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/ibuf/ibuf0ibuf.c
      storage/innodb_plugin/include/btr0btr.h
      storage/innodb_plugin/include/btr0btr.ic
      storage/innodb_plugin/include/btr0cur.h
      storage/innodb_plugin/include/btr0cur.ic
      storage/innodb_plugin/include/btr0sea.h
      storage/innodb_plugin/include/btr0types.h
      storage/innodb_plugin/include/buf0buf.h
      storage/innodb_plugin/include/buf0buf.ic
      storage/innodb_plugin/include/fsp0fsp.h
      storage/innodb_plugin/include/ha0ha.h
      storage/innodb_plugin/include/ha0ha.ic
      storage/innodb_plugin/include/mtr0mtr.ic
      storage/innodb_plugin/include/page0page.h
      storage/innodb_plugin/include/page0page.ic
      storage/innodb_plugin/include/row0upd.ic
      storage/innodb_plugin/include/sync0rw.h
      storage/innodb_plugin/include/sync0rw.ic
      storage/innodb_plugin/include/sync0sync.h
      storage/innodb_plugin/include/trx0undo.h
      storage/innodb_plugin/page/page0cur.c
      storage/innodb_plugin/page/page0page.c
      storage/innodb_plugin/row/row0ins.c
      storage/innodb_plugin/row/row0mysql.c
      storage/innodb_plugin/row/row0purge.c
      storage/innodb_plugin/row/row0sel.c
      storage/innodb_plugin/row/row0upd.c
      storage/innodb_plugin/sync/sync0rw.c
      storage/innodb_plugin/sync/sync0sync.c
      storage/innodb_plugin/trx/trx0rec.c
      storage/innodb_plugin/trx/trx0undo.c
      storage/myisam/ft_boolean_search.c
      storage/myisam/ft_nlq_search.c
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_check.c
      storage/myisam/mi_delete_all.c
      storage/myisam/mi_write.c
      strings/decimal.c
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      cmd-line-utils/libedit/el_terminal.h
      cmd-line-utils/libedit/keymacro.c
      cmd-line-utils/libedit/keymacro.h
      cmd-line-utils/libedit/terminal.c
 3466 jonas oreland	2012-02-13 [merge]
      ndb - merge 5.1.59 into 6.3

    added:
      include/welcome_copyright_notice.h
      mysql-test/suite/rpl/r/rpl_row_corruption.result
      mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt
      mysql-test/suite/rpl/t/rpl_row_corruption.test
    modified:
      CMakeLists.txt
      client/Makefile.am
      client/client_priv.h
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqltest.cc
      client/sql_string.cc
      configure.in
      extra/innochecksum.c
      extra/perror.c
      extra/replace.c
      extra/yassl/src/yassl_error.cpp
      extra/yassl/src/yassl_int.cpp
      include/Makefile.am
      include/heap.h
      include/m_string.h
      include/my_bit.h
      include/my_bitmap.h
      include/my_getopt.h
      include/my_global.h
      include/myisam.h
      libmysql/CMakeLists.txt
      libmysql/Makefile.shared
      mysql-test/Makefile.am
      mysql-test/collections/default.experimental
      mysql-test/include/mtr_warnings.sql
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/My/Find.pm
      mysql-test/lib/My/SafeProcess/safe_process.pl
      mysql-test/r/alter_table.result
      mysql-test/r/events_bugs.result
      mysql-test/r/func_time.result
      mysql-test/r/gis-rtree.result
      mysql-test/r/order_by.result
      mysql-test/r/partition.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp.result
      mysql-test/r/sp_sync.result
      mysql-test/r/trigger-compat.result
      mysql-test/r/trigger.result
      mysql-test/r/type_float.result
      mysql-test/r/union.result
      mysql-test/suite/innodb_plugin/r/innodb-index.result
      mysql-test/suite/innodb_plugin/r/innodb-zip.result
      mysql-test/suite/innodb_plugin/t/innodb-index.test
      mysql-test/suite/innodb_plugin/t/innodb-zip.test
      mysql-test/t/alter_table.test
      mysql-test/t/events_bugs.test
      mysql-test/t/func_time.test
      mysql-test/t/gis-rtree.test
      mysql-test/t/order_by.test
      mysql-test/t/partition.test
      mysql-test/t/sp-error.test
      mysql-test/t/sp.test
      mysql-test/t/sp_sync.test
      mysql-test/t/trigger-compat.test
      mysql-test/t/type_float.test
      mysql-test/t/union.test
      mysys/CMakeLists.txt
      mysys/Makefile.am
      mysys/my_bitmap.c
      mysys/my_compare.c
      mysys/my_net.c
      plugin/fulltext/plugin_example.c
      scripts/make_win_bin_dist
      sql/event_db_repository.cc
      sql/event_db_repository.h
      sql/event_parse_data.cc
      sql/event_parse_data.h
      sql/events.cc
      sql/field.cc
      sql/field.h
      sql/gen_lex_hash.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.h
      sql/item.cc
      sql/item_create.cc
      sql/item_strfunc.cc
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log_event.cc
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/opt_range.cc
      sql/opt_sum.cc
      sql/password.c
      sql/protocol.cc
      sql/sp.cc
      sql/sp_head.cc
      sql/spatial.cc
      sql/sql_analyse.cc
      sql/sql_base.cc
      sql/sql_binlog.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_db.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_string.cc
      sql/sql_table.cc
      sql/sql_trigger.cc
      sql/sql_trigger.h
      sql/sql_union.cc
      sql/sql_yacc.yy
      sql/table.cc
      sql/unireg.cc
      sql/unireg.h
      storage/archive/ha_archive.cc
      storage/heap/ha_heap.cc
      storage/heap/ha_heap.h
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0pcur.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0pcur.ic
      storage/innobase/include/btr0types.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/page0page.h
      storage/innobase/include/page0page.ic
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0roll.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/include/univ.i
      storage/innobase/include/ut0mem.h
      storage/innobase/include/ut0mem.ic
      storage/innobase/mtr/mtr0mtr.c
      storage/innobase/page/page0page.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0row.c
      storage/innobase/row/row0sel.c
      storage/innobase/row/row0umod.c
      storage/innobase/row/row0upd.c
      storage/innobase/row/row0vers.c
      storage/innobase/sync/sync0rw.c
      storage/innobase/sync/sync0sync.c
      storage/innobase/trx/trx0rec.c
      storage/innobase/ut/ut0mem.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/btr/btr0btr.c
      storage/innodb_plugin/btr/btr0cur.c
      storage/innodb_plugin/btr/btr0pcur.c
      storage/innodb_plugin/buf/buf0buddy.c
      storage/innodb_plugin/buf/buf0buf.c
      storage/innodb_plugin/buf/buf0flu.c
      storage/innodb_plugin/buf/buf0lru.c
      storage/innodb_plugin/buf/buf0rea.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/include/btr0btr.h
      storage/innodb_plugin/include/btr0cur.h
      storage/innodb_plugin/include/btr0cur.ic
      storage/innodb_plugin/include/btr0pcur.h
      storage/innodb_plugin/include/btr0pcur.ic
      storage/innodb_plugin/include/buf0buddy.h
      storage/innodb_plugin/include/buf0buddy.ic
      storage/innodb_plugin/include/buf0buf.h
      storage/innodb_plugin/include/buf0buf.ic
      storage/innodb_plugin/include/buf0lru.h
      storage/innodb_plugin/include/buf0types.h
      storage/innodb_plugin/include/mtr0mtr.h
      storage/innodb_plugin/include/page0cur.ic
      storage/innodb_plugin/include/page0page.h
      storage/innodb_plugin/include/page0page.ic
      storage/innodb_plugin/include/rem0rec.h
      storage/innodb_plugin/include/rem0rec.ic
      storage/innodb_plugin/include/row0row.h
      storage/innodb_plugin/include/row0row.ic
      storage/innodb_plugin/include/row0upd.ic
      storage/innodb_plugin/include/srv0srv.h
      storage/innodb_plugin/include/sync0rw.ic
      storage/innodb_plugin/include/sync0sync.h
      storage/innodb_plugin/include/trx0sys.h
      storage/innodb_plugin/include/trx0sys.ic
      storage/innodb_plugin/include/univ.i
      storage/innodb_plugin/include/ut0mem.h
      storage/innodb_plugin/include/ut0mem.ic
      storage/innodb_plugin/mtr/mtr0mtr.c
      storage/innodb_plugin/page/page0cur.c
      storage/innodb_plugin/page/page0page.c
      storage/innodb_plugin/page/page0zip.c
      storage/innodb_plugin/rem/rem0rec.c
      storage/innodb_plugin/row/row0ins.c
      storage/innodb_plugin/row/row0row.c
      storage/innodb_plugin/row/row0sel.c
      storage/innodb_plugin/row/row0upd.c
      storage/innodb_plugin/row/row0vers.c
      storage/innodb_plugin/srv/srv0srv.c
      storage/innodb_plugin/sync/sync0rw.c
      storage/innodb_plugin/sync/sync0sync.c
      storage/innodb_plugin/trx/trx0rec.c
      storage/innodb_plugin/trx/trx0undo.c
      storage/innodb_plugin/ut/ut0mem.c
      storage/myisam/ft_stopwords.c
      storage/myisam/ha_myisam.cc
      storage/myisam/ha_myisam.h
      storage/myisam/mi_check.c
      storage/myisam/mi_create.c
      storage/myisam/mi_range.c
      storage/myisam/mi_test1.c
      storage/myisam/mi_update.c
      storage/myisam/mi_write.c
      storage/myisam/myisamdef.h
      storage/myisam/sp_test.c
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/ha_myisammrg.h
      storage/ndb/src/kernel/blocks/lgman.cpp
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/mysys/bitmap-t.c
      vio/viosocket.c
      win/build-vs10.bat
      win/build-vs10_x64.bat
 3465 jonas oreland	2012-02-13 [merge]
      ndb - merge 63-main

    modified:
      mysql-test/include/mtr_warnings.sql
      mysql-test/suite/binlog/t/binlog_base64_flag.test

Diff too large for email (37253 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:3465 to 3467) jonas oreland14 Feb