maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  <Dao-Gang.Qu@xxxxxxx>
  <Li-Bing.Song@xxxxxxx>
  Aleksandr Kuzminsky (akuzminsky)
  Alexey Kopytov (akopytov)
  Alfranio Correia (acorreia)...

------------------------------------------------------------
revno: 2800 [merge]
committer: knielsen@xxxxxxxxxxxxxxx
branch nick: mariadb-5.1
timestamp: Sun 2010-01-17 18:22:46 +0100
message:
  Merge MySQL 5.1.42 and XtraDB 9 into MariaDB trunk, after fixing test failures.
removed:
  mysql-test/suite/maria/t/maria2-master.opt
  storage/xtradb/handler/handler0vars.h
  storage/xtradb/handler/win_delay_loader.cc
  storage/xtradb/win-plugin/
  storage/xtradb/win-plugin/README
  storage/xtradb/win-plugin/win-plugin.diff
added:
  mysql-test/extra/rpl_tests/rpl_not_null.test
  mysql-test/r/bug47671.result
  mysql-test/r/innodb-consistent.result
  mysql-test/r/innodb_bug44571.result
  mysql-test/r/innodb_bug46676.result
  mysql-test/r/innodb_bug47167.result
  mysql-test/std_data/bug47012.ARM
  mysql-test/std_data/bug47012.ARZ
  mysql-test/std_data/bug47012.frm
  mysql-test/suite/innodb/r/innodb_bug46676.result
  mysql-test/suite/innodb/r/innodb_bug47167.result
  mysql-test/suite/innodb/t/innodb_bug46676.test
  mysql-test/suite/innodb/t/innodb_bug47167.test
  mysql-test/suite/rpl/r/rpl_loaddata_symlink.result
  mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result
  mysql-test/suite/rpl/r/rpl_not_null_innodb.result
  mysql-test/suite/rpl/r/rpl_not_null_myisam.result
  mysql-test/suite/rpl/r/rpl_row_trunc_temp.result
  mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.opt
  mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh
  mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.opt
  mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh
  mysql-test/suite/rpl/t/rpl_loaddata_symlink.test
  mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test
  mysql-test/suite/rpl/t/rpl_not_null_innodb.test
  mysql-test/suite/rpl/t/rpl_not_null_myisam.test
  mysql-test/suite/rpl/t/rpl_row_trunc_temp.test
  mysql-test/t/bug47671-master.opt
  mysql-test/t/bug47671.test
  mysql-test/t/innodb-consistent-master.opt
  mysql-test/t/innodb-consistent.test
  mysql-test/t/innodb_bug44571.test
  mysql-test/t/innodb_bug46676.test
  mysql-test/t/innodb_bug47167.test
  storage/xtradb/ut/ut0auxconf_have_gcc_atomics.c
modified:
  Makefile.am
  client/mysql.cc
  configure.in
  extra/comp_err.c
  include/mysql.h
  include/mysql.h.pp
  include/violite.h
  libmysql/libmysql.c
  libmysql/libmysql.def
  libmysqld/libmysqld.def
  mysql-test/collections/default.experimental
  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
  mysql-test/extra/rpl_tests/rpl_stm_000001.test
  mysql-test/include/mtr_warnings.sql
  mysql-test/lib/mtr_cases.pm
  mysql-test/r/archive.result
  mysql-test/r/delayed.result
  mysql-test/r/delete.result
  mysql-test/r/fulltext.result
  mysql-test/r/func_group.result
  mysql-test/r/grant2.result
  mysql-test/r/group_min_max.result
  mysql-test/r/information_schema.result
  mysql-test/r/information_schema_all_engines.result
  mysql-test/r/innodb-autoinc.result
  mysql-test/r/innodb-index.result
  mysql-test/r/innodb-zip.result
  mysql-test/r/innodb.result
  mysql-test/r/innodb_bug36169.result
  mysql-test/r/innodb_bug44369.result
  mysql-test/r/innodb_file_format.result
  mysql-test/r/innodb_lock_wait_timeout_1.result
  mysql-test/r/innodb_mysql.result
  mysql-test/r/innodb_xtradb_bug317074.result
  mysql-test/r/mysql.result
  mysql-test/r/olap.result
  mysql-test/r/order_by.result
  mysql-test/r/partition.result
  mysql-test/r/range.result
  mysql-test/r/select.result
  mysql-test/r/show_check.result
  mysql-test/r/sp-destruct.result
  mysql-test/r/sp-security.result
  mysql-test/r/sp.result
  mysql-test/r/type_newdecimal.result
  mysql-test/r/type_year.result
  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
  mysql-test/suite/binlog/r/binlog_stm_row.result
  mysql-test/suite/binlog/r/binlog_unsafe.result
  mysql-test/suite/binlog/t/binlog_killed.test
  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
  mysql-test/suite/binlog/t/binlog_stm_row.test
  mysql-test/suite/binlog/t/binlog_unsafe.test
  mysql-test/suite/funcs_1/r/is_columns_is.result
  mysql-test/suite/funcs_1/r/is_tables_is.result
  mysql-test/suite/innodb/r/innodb-index.result
  mysql-test/suite/innodb/t/innodb-consistent-master.opt
  mysql-test/suite/innodb/t/innodb-index.test
  mysql-test/suite/parts/t/partition_alter1_2_innodb.test
  mysql-test/suite/parts/t/partition_alter2_1_innodb.test
  mysql-test/suite/parts/t/partition_alter2_2_innodb.test
  mysql-test/suite/parts/t/partition_alter4_innodb.test
  mysql-test/suite/pbxt/r/func_group.result
  mysql-test/suite/pbxt/r/mysqlshow.result
  mysql-test/suite/rpl/r/rpl_err_ignoredtable.result
  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
  mysql-test/suite/rpl/r/rpl_get_lock.result
  mysql-test/suite/rpl/r/rpl_row_create_table.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_stm_000001.result
  mysql-test/suite/rpl/r/rpl_trigger.result
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
  mysql-test/suite/rpl/t/rpl_get_lock.test
  mysql-test/suite/rpl/t/rpl_row_create_table.test
  mysql-test/suite/rpl/t/rpl_trigger.test
  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
  mysql-test/t/archive.test
  mysql-test/t/delayed.test
  mysql-test/t/delete.test
  mysql-test/t/disabled.def
  mysql-test/t/fulltext.test
  mysql-test/t/func_group.test
  mysql-test/t/grant2.test
  mysql-test/t/group_min_max.test
  mysql-test/t/innodb-analyze.test
  mysql-test/t/innodb-autoinc.test
  mysql-test/t/innodb-index.test
  mysql-test/t/innodb-master.opt
  mysql-test/t/innodb-semi-consistent-master.opt
  mysql-test/t/innodb-use-sys-malloc-master.opt
  mysql-test/t/innodb-zip.test
  mysql-test/t/innodb.test
  mysql-test/t/innodb_bug34300.test
  mysql-test/t/innodb_bug36169.test
  mysql-test/t/innodb_bug36172.test
  mysql-test/t/innodb_bug42101-nonzero-master.opt
  mysql-test/t/innodb_bug44369.test
  mysql-test/t/innodb_file_format.test
  mysql-test/t/innodb_information_schema.test
  mysql-test/t/innodb_lock_wait_timeout_1.test
  mysql-test/t/innodb_mysql.test
  mysql-test/t/innodb_xtradb_bug317074.test
  mysql-test/t/mysql.test
  mysql-test/t/olap.test
  mysql-test/t/order_by.test
  mysql-test/t/partition.test
  mysql-test/t/range.test
  mysql-test/t/select.test
  mysql-test/t/show_check.test
  mysql-test/t/sp-destruct.test
  mysql-test/t/sp-security.test
  mysql-test/t/sp.test
  mysql-test/t/type_newdecimal.test
  mysql-test/t/type_year.test
  mysys/my_getopt.c
  mysys/my_sync.c
  scripts/make_win_bin_dist
  scripts/mysql_secure_installation.pl.in
  scripts/mysql_secure_installation.sh
  sql/event_db_repository.cc
  sql/field.cc
  sql/field.h
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_cmpfunc.h
  sql/item_create.cc
  sql/item_func.cc
  sql/item_func.h
  sql/item_geofunc.cc
  sql/item_strfunc.cc
  sql/item_subselect.cc
  sql/item_subselect.h
  sql/item_sum.cc
  sql/item_sum.h
  sql/item_timefunc.cc
  sql/item_xmlfunc.cc
  sql/log.cc
  sql/log_event.cc
  sql/log_event.h
  sql/mysqld.cc
  sql/opt_range.cc
  sql/repl_failsafe.cc
  sql/rpl_record.cc
  sql/rpl_record.h
  sql/rpl_rli.cc
  sql/rpl_tblmap.cc
  sql/sp.cc
  sql/sp.h
  sql/sp_cache.cc
  sql/sp_head.cc
  sql/sp_head.h
  sql/sp_rcontext.cc
  sql/sql_acl.cc
  sql/sql_acl.h
  sql/sql_base.cc
  sql/sql_cache.cc
  sql/sql_cache.h
  sql/sql_class.cc
  sql/sql_delete.cc
  sql/sql_insert.cc
  sql/sql_load.cc
  sql/sql_parse.cc
  sql/sql_partition.cc
  sql/sql_select.cc
  sql/sql_show.cc
  sql/sql_table.cc
  sql/sql_yacc.yy
  sql/table.cc
  sql/table.h
  storage/archive/CMakeLists.txt*
  storage/archive/azio.c
  storage/archive/ha_archive.cc
  storage/federated/CMakeLists.txt*
  storage/innobase/btr/btr0btr.c
  storage/innobase/data/data0type.c
  storage/innobase/handler/ha_innodb.cc
  storage/innobase/include/ha_prototypes.h
  storage/innobase/include/mach0data.h
  storage/innobase/include/mach0data.ic
  storage/innobase/include/os0file.h
  storage/innobase/include/trx0trx.h
  storage/innobase/lock/lock0lock.c
  storage/innobase/os/os0file.c
  storage/innobase/row/row0sel.c
  storage/innobase/trx/trx0trx.c
  storage/innobase/ut/ut0ut.c
  storage/innodb_plugin/CMakeLists.txt
  storage/innodb_plugin/ChangeLog
  storage/innodb_plugin/btr/btr0btr.c
  storage/innodb_plugin/btr/btr0sea.c
  storage/innodb_plugin/buf/buf0buf.c
  storage/innodb_plugin/data/data0type.c
  storage/innodb_plugin/dict/dict0dict.c
  storage/innodb_plugin/fil/fil0fil.c
  storage/innodb_plugin/handler/ha_innodb.cc
  storage/innodb_plugin/handler/ha_innodb.h
  storage/innodb_plugin/handler/handler0alter.cc
  storage/innodb_plugin/ibuf/ibuf0ibuf.c
  storage/innodb_plugin/include/btr0sea.h
  storage/innodb_plugin/include/db0err.h
  storage/innodb_plugin/include/dict0dict.h
  storage/innodb_plugin/include/fil0fil.h
  storage/innodb_plugin/include/ha_prototypes.h
  storage/innodb_plugin/include/ibuf0ibuf.h
  storage/innodb_plugin/include/lock0lock.h
  storage/innodb_plugin/include/log0log.h
  storage/innodb_plugin/include/log0recv.h
  storage/innodb_plugin/include/mem0mem.h
  storage/innodb_plugin/include/mem0pool.h
  storage/innodb_plugin/include/os0file.h
  storage/innodb_plugin/include/pars0pars.h
  storage/innodb_plugin/include/srv0srv.h
  storage/innodb_plugin/include/thr0loc.h
  storage/innodb_plugin/include/trx0i_s.h
  storage/innodb_plugin/include/trx0purge.h
  storage/innodb_plugin/include/trx0rseg.h
  storage/innodb_plugin/include/trx0sys.h
  storage/innodb_plugin/include/trx0trx.h
  storage/innodb_plugin/include/trx0undo.h
  storage/innodb_plugin/include/univ.i
  storage/innodb_plugin/include/usr0sess.h
  storage/innodb_plugin/lock/lock0lock.c
  storage/innodb_plugin/log/log0log.c
  storage/innodb_plugin/log/log0recv.c
  storage/innodb_plugin/mem/mem0dbg.c
  storage/innodb_plugin/mem/mem0pool.c
  storage/innodb_plugin/os/os0file.c
  storage/innodb_plugin/os/os0sync.c
  storage/innodb_plugin/os/os0thread.c
  storage/innodb_plugin/pars/lexyy.c
  storage/innodb_plugin/pars/pars0lex.l
  storage/innodb_plugin/que/que0que.c
  storage/innodb_plugin/row/row0merge.c
  storage/innodb_plugin/row/row0mysql.c
  storage/innodb_plugin/srv/srv0srv.c
  storage/innodb_plugin/srv/srv0start.c
  storage/innodb_plugin/sync/sync0arr.c
  storage/innodb_plugin/sync/sync0sync.c
  storage/innodb_plugin/thr/thr0loc.c
  storage/innodb_plugin/trx/trx0i_s.c
  storage/innodb_plugin/trx/trx0purge.c
  storage/innodb_plugin/trx/trx0rseg.c
  storage/innodb_plugin/trx/trx0sys.c
  storage/innodb_plugin/trx/trx0trx.c
  storage/innodb_plugin/trx/trx0undo.c
  storage/innodb_plugin/usr/usr0sess.c
  storage/innodb_plugin/ut/ut0mem.c
  storage/myisam/ft_boolean_search.c
  storage/xtradb/CMakeLists.txt
  storage/xtradb/ChangeLog
  storage/xtradb/Makefile.am
  storage/xtradb/btr/btr0btr.c
  storage/xtradb/btr/btr0sea.c
  storage/xtradb/buf/buf0buddy.c
  storage/xtradb/buf/buf0buf.c
  storage/xtradb/buf/buf0flu.c
  storage/xtradb/buf/buf0lru.c
  storage/xtradb/buf/buf0rea.c
  storage/xtradb/data/data0type.c
  storage/xtradb/dict/dict0crea.c
  storage/xtradb/dict/dict0dict.c
  storage/xtradb/fil/fil0fil.c
  storage/xtradb/fsp/fsp0fsp.c
  storage/xtradb/handler/ha_innodb.cc
  storage/xtradb/handler/ha_innodb.h
  storage/xtradb/handler/handler0alter.cc
  storage/xtradb/handler/i_s.cc
  storage/xtradb/handler/i_s.h
  storage/xtradb/handler/innodb_patch_info.h
  storage/xtradb/ibuf/ibuf0ibuf.c
  storage/xtradb/include/btr0cur.h
  storage/xtradb/include/btr0sea.h
  storage/xtradb/include/buf0buf.h
  storage/xtradb/include/buf0buf.ic
  storage/xtradb/include/buf0lru.h
  storage/xtradb/include/buf0rea.h
  storage/xtradb/include/buf0types.h
  storage/xtradb/include/db0err.h
  storage/xtradb/include/dict0crea.h
  storage/xtradb/include/dict0dict.h
  storage/xtradb/include/dict0mem.h
  storage/xtradb/include/fil0fil.h
  storage/xtradb/include/fsp0fsp.h
  storage/xtradb/include/ibuf0ibuf.h
  storage/xtradb/include/lock0lock.h
  storage/xtradb/include/log0log.h
  storage/xtradb/include/log0log.ic
  storage/xtradb/include/log0recv.h
  storage/xtradb/include/mem0mem.h
  storage/xtradb/include/mem0pool.h
  storage/xtradb/include/mtr0mtr.h
  storage/xtradb/include/os0file.h
  storage/xtradb/include/os0sync.h
  storage/xtradb/include/page0page.h
  storage/xtradb/include/page0page.ic
  storage/xtradb/include/page0zip.h
  storage/xtradb/include/pars0pars.h
  storage/xtradb/include/rem0cmp.h
  storage/xtradb/include/rem0rec.ic
  storage/xtradb/include/row0ins.h
  storage/xtradb/include/row0mysql.h
  storage/xtradb/include/srv0srv.h
  storage/xtradb/include/sync0rw.h
  storage/xtradb/include/sync0sync.h
  storage/xtradb/include/thr0loc.h
  storage/xtradb/include/trx0i_s.h
  storage/xtradb/include/trx0purge.h
  storage/xtradb/include/trx0rec.h
  storage/xtradb/include/trx0rec.ic
  storage/xtradb/include/trx0roll.h
  storage/xtradb/include/trx0rseg.h
  storage/xtradb/include/trx0sys.h
  storage/xtradb/include/trx0sys.ic
  storage/xtradb/include/trx0trx.h
  storage/xtradb/include/trx0types.h
  storage/xtradb/include/trx0undo.h
  storage/xtradb/include/univ.i
  storage/xtradb/include/usr0sess.h
  storage/xtradb/include/ut0auxconf.h
  storage/xtradb/include/ut0byte.h
  storage/xtradb/include/ut0byte.ic
  storage/xtradb/include/ut0ut.h
  storage/xtradb/lock/lock0lock.c
  storage/xtradb/log/log0log.c
  storage/xtradb/log/log0recv.c
  storage/xtradb/mem/mem0dbg.c
  storage/xtradb/mem/mem0mem.c
  storage/xtradb/mem/mem0pool.c
  storage/xtradb/mtr/mtr0mtr.c
  storage/xtradb/os/os0file.c
  storage/xtradb/os/os0proc.c
  storage/xtradb/os/os0sync.c
  storage/xtradb/os/os0thread.c
  storage/xtradb/page/page0cur.c
  storage/xtradb/page/page0page.c
  storage/xtradb/page/page0zip.c
  storage/xtradb/pars/lexyy.c
  storage/xtradb/pars/pars0lex.l
  storage/xtradb/plug.in
  storage/xtradb/que/que0que.c
  storage/xtradb/rem/rem0cmp.c
  storage/xtradb/row/row0ins.c
  storage/xtradb/row/row0merge.c
  storage/xtradb/row/row0mysql.c
  storage/xtradb/row/row0sel.c
  storage/xtradb/scripts/install_innodb_plugins.sql
  storage/xtradb/scripts/install_innodb_plugins_win.sql
  storage/xtradb/srv/srv0srv.c
  storage/xtradb/srv/srv0start.c
  storage/xtradb/sync/sync0arr.c
  storage/xtradb/sync/sync0rw.c
  storage/xtradb/sync/sync0sync.c
  storage/xtradb/thr/thr0loc.c
  storage/xtradb/trx/trx0i_s.c
  storage/xtradb/trx/trx0purge.c
  storage/xtradb/trx/trx0rec.c
  storage/xtradb/trx/trx0roll.c
  storage/xtradb/trx/trx0rseg.c
  storage/xtradb/trx/trx0sys.c
  storage/xtradb/trx/trx0trx.c
  storage/xtradb/trx/trx0undo.c
  storage/xtradb/usr/usr0sess.c
  storage/xtradb/ut/ut0auxconf_atomic_pthread_t_solaris.c
  storage/xtradb/ut/ut0mem.c
  storage/xtradb/ut/ut0ut.c
  vio/vio.c
  vio/viosocket.c
The size of the diff (30894 lines) is larger than your specified limit of 5000 lines

--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.