diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-26 16:06:31 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-26 16:06:31 +0300 |
| commit | 84766b060a09ae3709fcd17cadc16c982c0d3a78 (patch) | |
| tree | d57dcac492c1a0c330c28bcf82a1d33db6111e5b /scripts/Makefile.am | |
| parent | a7dd42b57db41efc174b640f20bf9aff02f88415 (diff) | |
| parent | 03561d35e30807e841c8544a6f5c07d708c6acbd (diff) | |
| download | mariadb-git-84766b060a09ae3709fcd17cadc16c982c0d3a78.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
Diffstat (limited to 'scripts/Makefile.am')
| -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 cd758370388..1859dfce64a 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 |