Auto-merge from mysql-next-mr.

.bzr-mysql/default.conf

 [MYSQL]
 post_commit_to = "commits@lists.mysql.com"
 post_push_to = "commits@lists.mysql.com"
-tree_name = "mysql-5.6-next-mr"
+tree_name = "mysql-5.5-next-mr"

BUILD/.cvsignore

-compile-pentium-test

Docs/.cvsignore

-INSTALL-SOURCE
-INSTALL-BINARY
-Makefile
-Makefile.in
-mysql.info

client/.cvsignore

-.deps
-.libs
-Makefile
-Makefile.in
-insert_test
-mysql
-mysql-test
-mysql_test
-mysqladmin
-mysqldump
-mysqlimport
-mysqlshow
-select_test
-thread_test

cmd-line-utils/readline/.cvsignore

-.deps
-Makefile
-Makefile.in

configure.in

@@ -25,7 +25,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in client/mysqlbinlog.cc:check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.6.0-beta)
+AM_INIT_AUTOMAKE(mysql, 5.5.99)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 # Request support for automake silent-rules if available.

extra/.cvsignore

-.deps
-.libs
-Makefile
-Makefile.in
-comp_err
-my_print_defaults
-perror
-print_defaults
-replace
-resolveip

include/.cvsignore

-Makefile
-Makefile.in
-my_config.h
-mysql_version.h

libmysql/.cvsignore

-*.lo
-.deps
-.libs
-Makefile
-Makefile.in
-conf_to_src
-config.status
-configure
-ctype_extra_sources.c
-libmysqlclient.la

man/.cvsignore

-Makefile
-Makefile.in

mysys/.cvsignore

-.deps
-.libs
-Makefile
-Makefile.in
-st35l1t6
-test_charset
-test_thr_alarm
-test_thr_lock
-test_vsnprintf
-testhash

regex/.cvsignore

-.deps
-.libs
-Makefile
-Makefile.in
-re

scripts/.cvsignore

-Makefile
-Makefile.in
-make_binary_distribution
-msql2mysql
-mysql_config
-mysql_convert_table_format
-mysql_find_rows
-mysql_fix_privilege_tables
-mysql_install_db
-mysql_setpermission
-mysql_zap
-mysqlaccess
-mysqlbug
-mysqlhotcopy
-safe_mysqld

sql/.cvsignore

-.deps
-.libs
-Makefile
-Makefile.in
-deadlock_test.c
-gen_lex_hash
-lex_hash.h
-mysqlbinlog
-mysqlbinlog
-mysqld
-sql_yacc.cc
-sql_yacc.h

sql/share/.cvsignore

-Makefile
-Makefile.in

storage/heap/.cvsignore

-.deps
-.libs
-Makefile
-Makefile.in
-hp_test1
-hp_test2

storage/myisam/.cvsignore

-.deps
-.libs
-Makefile
-Makefile.in
-ft_eval
-ft_test1
-mi_test1
-mi_test2
-mi_test3
-rt_test
-sp_test
-myisamchk
-myisamlog
-myisampack

storage/myisammrg/.cvsignore

-.deps
-Makefile
-Makefile.in

strings/.cvsignore

-.deps
-.libs
-Makefile
-Makefile.in
-ctype_autoconf.c
-ctype_extra_sources.c
-conf_to_src
-old

support-files/.cvsignore

-Makefile
-Makefile.in
-binary-configure
-my-example.cnf
-my-huge.cnf
-my-large.cnf
-my-medium.cnf
-my-small.cnf
-mysql-3.*-alpha.spec
-mysql-3.23.21-beta.spec
-mysql-log-rotate
-mysql.server
-mysql.spec

tests/.cvsignore

-Makefile
-Makefile.in

vio/.cvsignore

-skr99