diff options
| author | unknown <konstantin@mysql.com> | 2006-03-30 18:43:42 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-03-30 18:43:42 +0400 |
| commit | cfef1a17fb1c8c6967e010955576123ed2008f66 (patch) | |
| tree | e3d33fa43591b7e3198be0a8da21e71368a5391a /storage | |
| parent | 68a4289f78c9e921174d5ecd6666ce53c981f40f (diff) | |
| parent | 4215924ea0b246af73feb3d64294cb77db537d1a (diff) | |
| download | mariadb-git-cfef1a17fb1c8c6967e010955576123ed2008f66.tar.gz | |
Merge mysql.com:/opt/local/work/tmp_merge
into mysql.com:/opt/local/work/mysql-5.1-merge
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_load.cc:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/tools/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/ndb/tools/Makefile.am b/storage/ndb/tools/Makefile.am index 77263a92b32..32da72b0094 100644 --- a/storage/ndb/tools/Makefile.am +++ b/storage/ndb/tools/Makefile.am @@ -1,4 +1,7 @@ +bin_SCRIPTS = ndb_size.pl ndb_error_reporter +dist_pkgdata_DATA = ndb_size.tmpl + ndbtools_PROGRAMS = \ ndb_test_platform \ ndb_waiter \ |