diff options
| author | unknown <joerg@trift2.> | 2007-05-02 14:08:43 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-05-02 14:08:43 +0200 |
| commit | 67601f55cbeea93d37b3c73ea5868a496e08cedc (patch) | |
| tree | 6686a05d664f8f110df9e9393c266b51f48f84dc /netware | |
| parent | 55153730b2aadba899284b2862647edefaa44757 (diff) | |
| parent | 589ae7b4e090aa866b492a823f7e773bda03e1ec (diff) | |
| download | mariadb-git-67601f55cbeea93d37b3c73ea5868a496e08cedc.tar.gz | |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M51/mysql-5.1
libmysqld/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
Auto merged
client/Makefile.am:
Merge does not fit - to be done manually.
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/netware/Makefile.am b/netware/Makefile.am index 0d45d001d11..df0072b3a2b 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -98,20 +98,20 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \ # Build init_db.sql from the files that contain # the system tables for this version of MySQL plus any commands init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \ - $(top_srcdir)/scripts/mysql_system_tables_data.sql + $(top_srcdir)/scripts/mysql_system_tables_data.sql @echo "Building $@"; @echo "CREATE DATABASE mysql;" > $@; @echo "CREATE DATABASE test;" >> $@; @echo "use mysql;" >> $@; @cat $(top_srcdir)/scripts/mysql_system_tables.sql \ - $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@; + $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@; # Build test_db.sql from init_db.sql plus # some test data test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql @echo "Building $@"; @cat init_db.sql \ - $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@; + $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@; endif |