Added missing files in libmysqld and the RPM spec file

5 files changed, 14 insertions, 4 deletions

diff --git a/.bzrignore b/.bzrignore
index 415aba16441..2a587e2b89f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -417,3 +417,4 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+libmysqld/repl_failsafe.cc
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 3ebfcaf8e38..951c57931ba 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -3532,12 +3532,18 @@ an application when you delete records from a table that has a foreign key.
 In practice this is as quick (in some cases quicker) and much more portable
 than using foreign keys.
 
+In MySQL 4.0 you can use multi-table delete to delete rows from many
+tables with one command. @xref{DELETE}.
+
 In the near future we will extend the @code{FOREIGN KEY} implementation so
 that at least the information will be saved in the table specification file
 and may be retrieved by @code{mysqldump} and ODBC. At a later stage we will
 implement the foreign key constraints for application that can't easily be
 coded to avoid them.
 
+MySQL 3.23.44 and forwards, InnoDB tables supports checking of foreign
+key constraints. @xref{InnoDB}.
+
 @menu
 * Broken Foreign KEY::          Reasons NOT to use foreign keys constraints
 @end menu
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index bcec7386ff1..badbc6d3425 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -45,7 +45,8 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \
 	item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \
 	item_uniq.cc key.cc lock.cc log.cc log_event.cc \
 	mini_client.cc net_pkg.cc net_serv.cc opt_ft.cc opt_range.cc \
-	opt_sum.cc procedure.cc records.cc slave.cc sql_acl.cc \
+	opt_sum.cc procedure.cc records.cc sql_acl.cc \
+	repl_failsafe.cc slave.cc \
 	sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \
 	sql_crypt.cc sql_db.cc sql_delete.cc sql_insert.cc sql_lex.cc \
 	sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 596edb84705..20874981840 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -169,8 +169,8 @@ test.t1	optimize	error	The handler for the table doesn't support check/repair
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Comment
 t1	0	PRIMARY	1	id	A	2	NULL	NULL	
-t1	1	parent_id	1	parent_id	A	4	NULL	NULL	
-t1	1	level	1	level	A	4	NULL	NULL	
+t1	1	parent_id	1	parent_id	A	2	NULL	NULL	
+t1	1	level	1	level	A	2	NULL	NULL	
 drop table t1;
 CREATE TABLE t1 (
 gesuchnr int(11) DEFAULT '0' NOT NULL,
@@ -211,7 +211,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	analyze	error	The handler for the table doesn't support check/repair
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Comment
-t1	1	skr	1	a	A	3	NULL	NULL	
+t1	1	skr	1	a	A	1	NULL	NULL	
 drop table t1;
 create table t1 (a int,b varchar(20),key(a)) type=innodb;
 insert into t1 values (1,""), (2,"testing");
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 1bc92e9b7e2..95d42fdc24d 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -424,6 +424,8 @@ fi
 %attr(-, root, root) /usr/share/sql-bench
 %attr(-, root, root) /usr/share/mysql-test
 %attr(755, root, root) /usr/bin/mysqlmanager
+%attr(755, root, root) /usr/bin/mysqlmanager-pwgen
+%attr(755, root, root) /usr/bin/mysqlmanagerc
 
 %files Max
 %attr(755, root, root) /usr/sbin/mysqld-max