diff options
| author | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-08-24 19:11:51 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-08-24 19:11:51 +0200 |
| commit | 7547a3f1781726f679911b6b1094617bd2d51e12 (patch) | |
| tree | 6ca3eb1bae4861a098f8bc3c4c262e1454c67210 /support-files | |
| parent | 2efd625f9235628d0620a1090153273b99efe7b3 (diff) | |
| parent | fd989054c728bbe830678aefedefc11e46577936 (diff) | |
| download | mariadb-git-7547a3f1781726f679911b6b1094617bd2d51e12.tar.gz | |
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
server-tools/instance-manager/listener.cc:
Auto merged
server-tools/instance-manager/portability.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
client/mysql.cc:
manual merge
mysql-test/r/grant.result:
manual merge
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index d0bbe74d046..20bfd7188d2 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -626,6 +626,9 @@ fi %attr(755, root, root) %{_bindir}/ndb_show_tables %attr(755, root, root) %{_bindir}/ndb_test_platform %attr(755, root, root) %{_bindir}/ndb_config +%attr(755, root, root) %{_bindir}/ndb_error_reporter +%attr(755, root, root) %{_bindir}/ndb_size.pl +%attr(-, root, root) %{_datadir}/mysql/ndb_size.tmpl %files ndb-extra %defattr(-,root,root,0755) |