database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.

Browse Source 
Conflicts:

Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
This commit is contained in:
Alexey Kopytov
2010-02-26 16:06:31 +03:00
parent a7dd42b57d 03561d35e3
commit 84766b060a
18 changed files with 242 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/Makefile.am
View File

@ -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