diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-02 17:34:50 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-02 17:34:50 +0300 |
| commit | c17e2664371c1643135f8cfc245b8c1ed4f59f3d (patch) | |
| tree | b41651212156dfd684f8a54791bdf3b7cfc85c25 /scripts | |
| parent | 5a05c470eeede16c33586f95e0bf555c80bd81fb (diff) | |
| parent | c04e5bbe7069566b5842cc1f04687d5c964ab2ad (diff) | |
| download | mariadb-git-c17e2664371c1643135f8cfc245b8c1ed4f59f3d.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_base.cc
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index dac073d00c1..118c312d218 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -112,7 +112,8 @@ mysqlbug: ${top_builddir}/config.status mysqlbug.sh mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ mysql_system_tables_fix.sql @echo "Building $@"; - @cat $(srcdir)/mysql_system_tables.sql $(srcdir)/mysql_system_tables_fix.sql > $@ + @cat $(srcdir)/mysql_system_tables.sql \ + $(srcdir)/mysql_system_tables_fix.sql > $@ # # Build mysql_fix_privilege_tables_sql.c from |