List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:November 26 2010 10:24am
Subject:bzr push into mysql-5.1 branch (Georgi.Kodinov:3475 to 3476)
View as plain text  
 3476 Georgi Kodinov	2010-11-26
      bumped up the version string.

    modified:
      configure.in
 3475 karen.langford@stripped	2010-11-18 [merge]
      Merge from mysql-5.1.53-release

    removed:
      mysql-test/suite/rpl/t/rpl_binlog_max_cache_size-master.opt
    added:
      mysql-test/extra/rpl_tests/rpl_stop_slave.test
      mysql-test/r/lowercase_table4.result
      mysql-test/suite/innodb/r/innodb_bug56143.result
      mysql-test/suite/innodb/r/innodb_bug56680.result
      mysql-test/suite/innodb/r/innodb_bug57252.result
      mysql-test/suite/innodb/t/innodb_bug56143.test
      mysql-test/suite/innodb/t/innodb_bug56680.test
      mysql-test/suite/innodb/t/innodb_bug57252.test
      mysql-test/suite/innodb_plugin/r/innodb_bug56143.result
      mysql-test/suite/innodb_plugin/r/innodb_bug56632.result
      mysql-test/suite/innodb_plugin/r/innodb_bug56680.result
      mysql-test/suite/innodb_plugin/r/innodb_bug56947.result
      mysql-test/suite/innodb_plugin/r/innodb_bug57252.result
      mysql-test/suite/innodb_plugin/t/innodb_bug56143.test
      mysql-test/suite/innodb_plugin/t/innodb_bug56632.test
      mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
      mysql-test/suite/innodb_plugin/t/innodb_bug56947.test
      mysql-test/suite/innodb_plugin/t/innodb_bug57252.test
      mysql-test/suite/rpl/r/rpl_stop_slave.result
      mysql-test/suite/rpl/t/rpl_stop_slave.test
      mysql-test/t/lowercase_table4-master.opt
      mysql-test/t/lowercase_table4.test
    modified:
      BUILD/SETUP.sh
      client/mysql.cc
      client/mysqltest.cc
      client/sql_string.h
      cmd-line-utils/libedit/common.c
      cmd-line-utils/libedit/filecomplete.c
      cmd-line-utils/libedit/readline.c
      cmd-line-utils/libedit/vi.c
      cmd-line-utils/readline/complete.c
      cmd-line-utils/readline/histexpand.c
      cmd-line-utils/readline/histfile.c
      cmd-line-utils/readline/isearch.c
      cmd-line-utils/readline/parens.c
      cmd-line-utils/readline/readline.c
      cmd-line-utils/readline/terminal.c
      cmd-line-utils/readline/text.c
      config/ac-macros/maintainer.m4
      configure.in
      dbug/dbug.c
      include/my_compiler.h
      include/my_dbug.h
      include/my_pthread.h
      mysql-test/collections/default.experimental
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/include/check_concurrent_insert.inc
      mysql-test/include/check_no_concurrent_insert.inc
      mysql-test/include/get_relay_log_pos.inc
      mysql-test/include/index_merge2.inc
      mysql-test/include/kill_query.inc
      mysql-test/include/kill_query_and_diff_master_slave.inc
      mysql-test/include/setup_fake_relay_log.inc
      mysql-test/include/show_binlog_events.inc
      mysql-test/include/show_rpl_debug_info.inc
      mysql-test/include/wait_for_slave_io_error.inc
      mysql-test/include/wait_for_slave_param.inc
      mysql-test/include/wait_for_slave_sql_error.inc
      mysql-test/include/wait_for_status_var.inc
      mysql-test/mysql-test-run.pl
      mysql-test/r/ctype_utf8.result
      mysql-test/r/explain.result
      mysql-test/r/fulltext.result
      mysql-test/r/func_gconcat.result
      mysql-test/r/func_math.result
      mysql-test/r/func_misc.result
      mysql-test/r/grant.result
      mysql-test/r/grant3.result
      mysql-test/r/group_by.result
      mysql-test/r/index_merge_innodb.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/join_outer.result
      mysql-test/r/partition_innodb.result
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/rpl/r/rpl_alter.result
      mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
      mysql-test/suite/rpl/t/rpl_alter.test
      mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test
      mysql-test/suite/rpl/t/rpl_do_grant.test
      mysql-test/suite/rpl/t/rpl_killed_ddl.test
      mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
      mysql-test/t/ctype_utf8.test
      mysql-test/t/disabled.def
      mysql-test/t/explain.test
      mysql-test/t/fulltext.test
      mysql-test/t/func_gconcat.test
      mysql-test/t/func_math.test
      mysql-test/t/func_misc.test
      mysql-test/t/grant.test
      mysql-test/t/grant3.test
      mysql-test/t/group_by.test
      mysql-test/t/join_outer.test
      mysql-test/t/mysqltest.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/wait_timeout.test
      mysys/my_gethostbyname.c
      mysys/my_gethwaddr.c
      mysys/my_symlink.c
      mysys/my_sync.c
      mysys/thr_mutex.c
      regex/main.c
      sql/ha_ndbcluster.cc
      sql/ha_partition.cc
      sql/handler.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.cc
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/lock.cc
      sql/log.cc
      sql/log_event.cc
      sql/log_event.h
      sql/my_decimal.h
      sql/mysql_priv.h
      sql/rpl_rli.h
      sql/set_var.cc
      sql/slave.cc
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_db.cc
      sql/sql_help.cc
      sql/sql_insert.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_select.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_union.cc
      sql/sql_update.cc
      sql/sql_yacc.yy
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/dict/dict0load.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/buf0flu.h
      storage/innobase/include/buf0lru.h
      storage/innobase/include/ibuf0ibuf.h
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/row0mysql.h
      storage/innobase/include/row0upd.h
      storage/innobase/include/ut0dbg.h
      storage/innobase/os/os0file.c
      storage/innobase/row/row0mysql.c
      storage/innobase/row/row0sel.c
      storage/innobase/row/row0upd.c
      storage/innobase/trx/trx0undo.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/btr/btr0cur.c
      storage/innodb_plugin/buf/buf0buf.c
      storage/innodb_plugin/buf/buf0flu.c
      storage/innodb_plugin/dict/dict0load.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/handler/ha_innodb.h
      storage/innodb_plugin/ibuf/ibuf0ibuf.c
      storage/innodb_plugin/include/btr0cur.h
      storage/innodb_plugin/include/buf0flu.h
      storage/innodb_plugin/include/ibuf0ibuf.h
      storage/innodb_plugin/include/row0mysql.h
      storage/innodb_plugin/include/row0upd.h
      storage/innodb_plugin/os/os0file.c
      storage/innodb_plugin/plug.in
      storage/innodb_plugin/row/row0mysql.c
      storage/innodb_plugin/row/row0sel.c
      storage/innodb_plugin/row/row0upd.c
      storage/innodb_plugin/srv/srv0start.c
      storage/innodb_plugin/trx/trx0undo.c
      storage/myisam/myisamchk.c
      storage/myisammrg/ha_myisammrg.cc
      unittest/examples/skip-t.c
      unittest/examples/skip_all-t.c
      unittest/examples/todo-t.c
      unittest/mytap/t/basic-t.c
      unittest/mytap/tap.c
      unittest/mytap/tap.h
=== modified file 'configure.in'
--- a/configure.in	2010-11-18 15:35:31 +0000
+++ b/configure.in	2010-11-26 10:24:05 +0000
@@ -12,7 +12,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.54], [], [mysql])
+AC_INIT([MySQL Server], [5.1.55], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1 branch (Georgi.Kodinov:3475 to 3476) Georgi Kodinov26 Nov