List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:September 13 2010 2:19pm
Subject:bzr push into mysql-5.1 branch (Georgi.Kodinov:3468 to 3469)
View as plain text  
 3469 Georgi Kodinov	2010-09-13
       Raise version number after cloning 5.1.51

    modified:
      configure.in
 3468 karen.langford@stripped	2010-08-19 [merge]
      Merge from mysql-5.1.50-release

    removed:
      include/atomic/
      include/atomic/gcc_builtins.h
      include/atomic/nolock.h
      include/atomic/rwlock.h
      include/atomic/x86-gcc.h
      include/atomic/x86-msvc.h
      include/my_atomic.h
      mysys/my_atomic.c
      strings/bcmp.c
      strings/bzero.c
      unittest/mysys/my_atomic-t.c
    added:
      config/ac-macros/maintainer.m4
      include/my_compiler.h
      mysql-test/include/rpl_diff_tables.inc
      mysql-test/suite/innodb/r/innodb_bug53756.result
      mysql-test/suite/innodb/t/innodb_bug53756-master.opt
      mysql-test/suite/innodb/t/innodb_bug53756.test
      mysql-test/suite/innodb_plugin/r/innodb_bug54453.result
      mysql-test/suite/innodb_plugin/t/innodb_bug54453.test
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/r/rpl_current_user.result
      mysql-test/suite/rpl/t/rpl_conditional_comments.test
      mysql-test/suite/rpl/t/rpl_current_user.cnf
      mysql-test/suite/rpl/t/rpl_current_user.test
      mysql-test/t/ssl_8k_key-master.opt
      unittest/strings/
      unittest/strings/Makefile.am
      unittest/strings/strings-t.c
    modified:
      BUILD/SETUP.sh
      BUILD/check-cpu
      Makefile.am
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqlshow.c
      client/mysqltest.cc
      client/sql_string.cc
      cmd-line-utils/readline/Makefile.am
      cmd-line-utils/readline/input.c
      configure.in
      extra/comp_err.c
      extra/replace.c
      extra/yassl/src/crypto_wrapper.cpp
      extra/yassl/src/yassl_imp.cpp
      extra/yassl/taocrypt/include/blowfish.hpp
      extra/yassl/taocrypt/include/runtime.hpp
      extra/yassl/taocrypt/src/aes.cpp
      extra/yassl/taocrypt/src/algebra.cpp
      extra/yassl/taocrypt/src/blowfish.cpp
      extra/yassl/taocrypt/src/coding.cpp
      extra/yassl/taocrypt/src/integer.cpp
      extra/yassl/taocrypt/src/misc.cpp
      extra/yassl/taocrypt/src/twofish.cpp
      extra/yassl/testsuite/test.hpp
      include/Makefile.am
      include/m_string.h
      include/my_bitmap.h
      include/my_global.h
      include/my_pthread.h
      include/mysql.h
      include/mysql.h.pp
      include/mysys_err.h
      libmysql/Makefile.shared
      libmysql/libmysql.c
      libmysqld/examples/Makefile.am
      mysql-test/Makefile.am
      mysql-test/include/commit.inc
      mysql-test/include/diff_tables.inc
      mysql-test/include/have_innodb_plugin.inc
      mysql-test/lib/My/SafeProcess/safe_process.cc
      mysql-test/r/commit_1innodb.result
      mysql-test/r/func_gconcat.result
      mysql-test/r/func_misc.result
      mysql-test/r/group_by.result
      mysql-test/r/having.result
      mysql-test/r/information_schema.result
      mysql-test/r/loaddata.result
      mysql-test/r/lowercase_table2.result
      mysql-test/r/lowercase_view.result
      mysql-test/r/mysql_client_test.result
      mysql-test/r/mysql_upgrade.result
      mysql-test/r/update.result
      mysql-test/std_data/server8k-cert.pem
      mysql-test/std_data/server8k-key.pem
      mysql-test/suite/funcs_1/r/is_basics_mixed.result
      mysql-test/suite/funcs_1/r/is_columns_innodb.result
      mysql-test/suite/funcs_1/r/is_columns_is.result
      mysql-test/suite/funcs_1/r/is_columns_memory.result
      mysql-test/suite/funcs_1/r/is_columns_myisam.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
      mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
      mysql-test/suite/rpl/r/rpl_drop.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/t/rpl_drop.test
      mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/t/func_gconcat.test
      mysql-test/t/func_misc.test
      mysql-test/t/group_by.test
      mysql-test/t/having.test
      mysql-test/t/information_schema.test
      mysql-test/t/loaddata.test
      mysql-test/t/lowercase_view.test
      mysql-test/t/mysql_client_test.test
      mysql-test/t/mysql_upgrade.test
      mysql-test/t/update.test
      mysys/Makefile.am
      mysys/errors.c
      mysys/mf_iocache.c
      mysys/mf_loadpath.c
      mysys/mf_pack.c
      mysys/my_bitmap.c
      mysys/my_copy.c
      mysys/my_gethwaddr.c
      mysys/my_getopt.c
      mysys/my_handler.c
      mysys/my_redel.c
      mysys/safemalloc.c
      mysys/stacktrace.c
      mysys/thr_lock.c
      plugin/daemon_example/Makefile.am
      regex/engine.c
      regex/regcomp.c
      scripts/mysql_secure_installation.pl.in
      scripts/mysql_secure_installation.sh
      scripts/mysql_system_tables_fix.sql
      server-tools/instance-manager/instance_options.cc
      sql-common/my_time.c
      sql/field.cc
      sql/filesort.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_buff.cc
      sql/item_create.cc
      sql/item_func.cc
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/my_decimal.cc
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/partition_info.cc
      sql/protocol.cc
      sql/rpl_rli.cc
      sql/set_var.cc
      sql/set_var.h
      sql/slave.cc
      sql/spatial.cc
      sql/spatial.h
      sql/sql_acl.cc
      sql/sql_analyse.cc
      sql/sql_base.cc
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_cursor.cc
      sql/sql_delete.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_list.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_prepare.cc
      sql/sql_repl.cc
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_string.cc
      sql/sql_table.cc
      sql/sql_update.cc
      sql/table.cc
      sql/table.h
      sql/udf_example.c
      sql/unireg.h
      storage/archive/Makefile.am
      storage/blackhole/Makefile.am
      storage/csv/Makefile.am
      storage/csv/ha_tina.cc
      storage/example/Makefile.am
      storage/example/ha_example.cc
      storage/federated/Makefile.am
      storage/federated/ha_federated.cc
      storage/heap/hp_hash.c
      storage/heap/hp_test2.c
      storage/ibmdb2i/Makefile.am
      storage/ibmdb2i/db2i_file.h
      storage/innobase/Makefile.am
      storage/innobase/dict/dict0load.c
      storage/innobase/os/os0file.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/Makefile.am
      storage/innodb_plugin/btr/btr0cur.c
      storage/innodb_plugin/btr/btr0sea.c
      storage/innodb_plugin/ha/ha0ha.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/include/btr0cur.h
      storage/innodb_plugin/include/btr0sea.h
      storage/innodb_plugin/include/mem0pool.h
      storage/innodb_plugin/include/row0mysql.h
      storage/innodb_plugin/include/univ.i
      storage/innodb_plugin/mem/mem0mem.c
      storage/innodb_plugin/mem/mem0pool.c
      storage/innodb_plugin/row/row0merge.c
      storage/innodb_plugin/row/row0row.c
      storage/innodb_plugin/row/row0sel.c
      storage/innodb_plugin/row/row0undo.c
      storage/innodb_plugin/row/row0upd.c
      storage/innodb_plugin/srv/srv0start.c
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_locking.c
      storage/myisam/mi_open.c
      storage/myisam/mi_page.c
      storage/myisam/mi_search.c
      storage/myisam/mi_test2.c
      storage/myisam/mi_unique.c
      storage/myisam/rt_split.c
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/myrg_open.c
      storage/ndb/src/common/portlib/NdbMutex.c
      storage/ndb/src/ndbapi/DictCache.cpp
      strings/CMakeLists.txt
      strings/Makefile.am
      strings/ctype-big5.c
      strings/ctype-cp932.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-mb.c
      strings/ctype-sjis.c
      strings/ctype-ucs2.c
      strings/ctype-ujis.c
      strings/decimal.c
      strings/make-ccc
      strings/str_test.c
      strings/xml.c
      tests/mysql_client_test.c
      unittest/Makefile.am
      unittest/mysys/Makefile.am
=== modified file 'configure.in'
--- a/configure.in	2010-08-19 15:18:58 +0000
+++ b/configure.in	2010-09-13 14:17:50 +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.51], [], [mysql])
+AC_INIT([MySQL Server], [5.1.52], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM


Attachment: [text/bzr-bundle] bzr/georgi.kodinov@oracle.com-20100913141750-2etd8c6ttyfvdxh7.bundle
Thread
bzr push into mysql-5.1 branch (Georgi.Kodinov:3468 to 3469) Georgi Kodinov13 Sep