maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  <Dao-Gang.Qu@xxxxxxx>
  <Li-Bing.Song@xxxxxxx>
  Alexey Kopytov (akopytov)
  Alfranio Correia (acorreia)
  Anurag Shekhar <anurag.shekhar@xxxxxxx>...

------------------------------------------------------------
revno: 2760 [merge]
committer: knielsen@xxxxxxxxxxxxxxx
branch nick: tmp
timestamp: Fri 2009-11-06 18:22:32 +0100
message:
  Merge Mysql 5.1.39 merge into MariaDB trunk
added:
  mysql-test/extra/rpl_tests/rpl_mixing_engines.test
  mysql-test/include/partition_date_range.inc
  mysql-test/include/rpl_loaddata_charset.inc
  mysql-test/r/disabled_partition.require
  mysql-test/r/partition_disabled.result
  mysql-test/std_data/loaddata_utf8.dat
  mysql-test/std_data/parts/t1.frm
  mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
  mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
  mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
  mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
  mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test
  mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
  mysql-test/t/partition_disabled-master.opt
  mysql-test/t/partition_disabled.test
modified:
  BUILD/check-cpu
  client/mysql.cc
  client/mysql_upgrade.c
  client/mysqladmin.cc
  client/mysqldump.c
  client/mysqltest.cc
  cmd-line-utils/readline/bind.c
  cmd-line-utils/readline/histfile.c
  cmd-line-utils/readline/undo.c
  include/my_global.h
  libmysql/libmysql.c
  mysql-test/collections/default.experimental
  mysql-test/include/commit.inc
  mysql-test/r/analyse.result
  mysql-test/r/auto_increment.result
  mysql-test/r/commit_1innodb.result
  mysql-test/r/group_min_max.result
  mysql-test/r/handler_myisam.result
  mysql-test/r/lock_multi_bug38499.result
  mysql-test/r/lock_multi_bug38691.result
  mysql-test/r/merge.result
  mysql-test/r/mysqlbinlog_row_trans.result
  mysql-test/r/not_partition.result
  mysql-test/r/partition.result
  mysql-test/r/partition_pruning.result
  mysql-test/r/partition_range.result
  mysql-test/r/subselect.result
  mysql-test/r/type_newdecimal.result
  mysql-test/r/view.result
  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
  mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
  mysql-test/suite/pbxt/r/partition_range.result
  mysql-test/suite/pbxt/r/subselect.result
  mysql-test/suite/pbxt/t/subselect.test
  mysql-test/suite/rpl/r/rpl_concurrency_error.result
  mysql-test/suite/rpl/r/rpl_drop_if_exists.result
  mysql-test/suite/rpl/r/rpl_drop_temp.result
  mysql-test/suite/rpl/r/rpl_events.result
  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
  mysql-test/suite/rpl/r/rpl_loaddata_charset.result
  mysql-test/suite/rpl/r/rpl_rewrt_db.result
  mysql-test/suite/rpl/t/rpl_concurrency_error.test
  mysql-test/suite/rpl/t/rpl_drop_temp.test
  mysql-test/suite/rpl/t/rpl_events.test
  mysql-test/suite/rpl/t/rpl_loaddata_charset.test
  mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
  mysql-test/suite/rpl/t/rpl_rewrt_db.test
  mysql-test/t/analyse.test
  mysql-test/t/auto_increment.test
  mysql-test/t/group_min_max.test
  mysql-test/t/handler_myisam.test
  mysql-test/t/lock_multi_bug38499.test
  mysql-test/t/lock_multi_bug38691.test
  mysql-test/t/merge.test
  mysql-test/t/not_partition.test
  mysql-test/t/partition.test
  mysql-test/t/partition_pruning.test
  mysql-test/t/subselect.test
  mysql-test/t/type_newdecimal.test
  mysql-test/t/view.test
  mysys/array.c
  mysys/mf_iocache.c
  mysys/mf_pack.c
  mysys/my_copy.c
  mysys/my_getopt.c
  mysys/my_redel.c
  mysys/safemalloc.c
  mysys/typelib.c
  regex/regcomp.c
  server-tools/instance-manager/mysql_connection.cc
  sql-common/client.c
  sql-common/my_time.c
  sql/client_settings.h
  sql/events.cc
  sql/field.cc
  sql/field.h
  sql/ha_partition.cc
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_create.cc
  sql/item_func.cc
  sql/item_func.h
  sql/item_sum.cc
  sql/item_timefunc.cc
  sql/lock.cc
  sql/log.cc
  sql/log_event.cc
  sql/my_decimal.h
  sql/mysql_priv.h
  sql/opt_range.cc
  sql/partition_info.h
  sql/share/errmsg.txt
  sql/slave.cc
  sql/spatial.cc
  sql/sql_base.cc
  sql/sql_db.cc
  sql/sql_delete.cc
  sql/sql_insert.cc
  sql/sql_parse.cc
  sql/sql_partition.cc
  sql/sql_profile.cc
  sql/sql_select.cc
  sql/sql_show.cc
  sql/sql_table.cc
  sql/sql_update.cc
  sql/sql_view.cc
  sql/sql_yacc.yy
  sql/table.cc
  storage/heap/hp_test2.c
  storage/myisam/ft_boolean_search.c
  storage/myisam/mi_check.c
  storage/myisam/mi_create.c
  storage/myisam/mi_delete.c
  storage/myisam/mi_dynrec.c
  storage/myisam/mi_open.c
  storage/myisam/mi_packrec.c
  storage/myisam/mi_search.c
  storage/myisam/mi_update.c
  storage/myisam/sort.c
  storage/myisammrg/ha_myisammrg.cc
  storage/myisammrg/myrg_open.c
  storage/myisammrg/myrg_rkey.c
  storage/ndb/include/mgmapi/ndb_logevent.h
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
  storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
  strings/ctype-ucs2.c
  strings/ctype-utf8.c
  strings/decimal.c
  support-files/mysql.spec.sh
  tests/mysql_client_test.c
The size of the diff (10169 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.