diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:39:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:39:44 +0300 |
| commit | 1913b715bc6559d3c79f8eb9cddfd971fb1dd785 (patch) | |
| tree | c9c3978afa21ee1f05cc50ff5b86a8ab31ec80ee /scripts | |
| parent | bf875901047faa8796aa0fe6a6bca32ea7fde956 (diff) | |
| parent | 031657c6943aab8109cd08321048ed1f3c943a34 (diff) | |
| download | mariadb-git-1913b715bc6559d3c79f8eb9cddfd971fb1dd785.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/share/Makefile.am
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 |