Auto-merge from mysql-next-mr.

2025-01-19 13:32:33 +01:00 · 2009-12-16 13:27:50 +03:00 · 2009-12-16 13:27:50 +03:00 · f0ae3168a3
commit f0ae3168a3
parent efaa28abb4 b3d9906907
22 changed files with 2 additions and 142 deletions
--- a/.bzr-mysql/default.conf
+++ b/.bzr-mysql/default.conf
@ -1,4 +1,4 @@
 [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"
--- a/BUILD/.cvsignore
+++ b/BUILD/.cvsignore
@ -1 +0,0 @@
-compile-pentium-test
--- a/Docs/.cvsignore
+++ b/Docs/.cvsignore
@ -1,5 +0,0 @@
-INSTALL-SOURCE
-INSTALL-BINARY
-Makefile
-Makefile.in
-mysql.info
--- a/client/.cvsignore
+++ b/client/.cvsignore
@ -1,14 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-insert_test
-mysql
-mysql-test
-mysql_test
-mysqladmin
-mysqldump
-mysqlimport
-mysqlshow
-select_test
-thread_test
--- a/cmd-line-utils/readline/.cvsignore
+++ b/cmd-line-utils/readline/.cvsignore
@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
--- a/configure.in
+++ b/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.
--- a/extra/.cvsignore
+++ b/extra/.cvsignore
@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-comp_err
-my_print_defaults
-perror
-print_defaults
-replace
-resolveip
--- a/include/.cvsignore
+++ b/include/.cvsignore
@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-my_config.h
-mysql_version.h
--- a/libmysql/.cvsignore
+++ b/libmysql/.cvsignore
@ -1,10 +0,0 @@
-*.lo
-.deps
-.libs
-Makefile
-Makefile.in
-conf_to_src
-config.status
-configure
-ctype_extra_sources.c
-libmysqlclient.la
--- a/man/.cvsignore
+++ b/man/.cvsignore
@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/mysys/.cvsignore
+++ b/mysys/.cvsignore
@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-st35l1t6
-test_charset
-test_thr_alarm
-test_thr_lock
-test_vsnprintf
-testhash
--- a/regex/.cvsignore
+++ b/regex/.cvsignore
@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-re
--- a/scripts/.cvsignore
+++ b/scripts/.cvsignore
@ -1,15 +0,0 @@
-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
--- a/sql/.cvsignore
+++ b/sql/.cvsignore
@ -1,12 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-deadlock_test.c
-gen_lex_hash
-lex_hash.h
-mysqlbinlog
-mysqlbinlog
-mysqld
-sql_yacc.cc
-sql_yacc.h
--- a/sql/share/.cvsignore
+++ b/sql/share/.cvsignore
@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/storage/heap/.cvsignore
+++ b/storage/heap/.cvsignore
@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-hp_test1
-hp_test2
--- a/storage/myisam/.cvsignore
+++ b/storage/myisam/.cvsignore
@ -1,14 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-ft_eval
-ft_test1
-mi_test1
-mi_test2
-mi_test3
-rt_test
-sp_test
-myisamchk
-myisamlog
-myisampack
--- a/storage/myisammrg/.cvsignore
+++ b/storage/myisammrg/.cvsignore
@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
--- a/strings/.cvsignore
+++ b/strings/.cvsignore
@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-ctype_autoconf.c
-ctype_extra_sources.c
-conf_to_src
-old
--- a/support-files/.cvsignore
+++ b/support-files/.cvsignore
@ -1,13 +0,0 @@
-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
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/vio/.cvsignore
+++ b/vio/.cvsignore
@ -1 +0,0 @@
-skr99