← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to scripts/Makefile.am

Committer: Monty Taylor
Date: 2008-07-07 20:53:23 UTC
mfrom: (84 drizzle)
mto: (28.2.2 packaging) (80.3.5 drizzle-stew-remove-old_password) (77.6.1 glibclient-merge)
mto: This revision was merged to the branch mainline in revision 104.
Revision ID: monty@inaugust.com-20080707205323-053am5em7fy4sdwi

Merged from trunk.

files removed:
scripts/mysql_system_tables.sql

scripts/mysql_system_tables_fix.sql

scripts/mysql_test_data_timezone.sql

files modified:
mysql-test/mysql-test-run.pl

mysql-test/r/information_schema.result

mysql-test/r/join.result

mysql-test/r/lock.result

mysql-test/t/information_schema.test

mysql-test/t/join.test

mysql-test/t/lock.test

scripts/Makefile.am

sql/mysql_priv.h

sql/mysqld.cc

sql/sql_udf.cc

sql/table.cc

Show diffs side-by-side

added added

removed removed

scripts/Makefile.am

42

42

mysqld_multi.sh \

43

43

mysqld_safe.sh

44

44

45

EXTRA_DIST = $(EXTRA_SCRIPTS) \

46

mysql_system_tables_fix.sql

45

EXTRA_DIST = $(EXTRA_SCRIPTS)

46

47

47

48

dist_pkgdata_DATA = fill_help_tables.sql \

49

mysql_system_tables.sql \

50

mysql_test_data_timezone.sql

48

dist_pkgdata_DATA =

51

49

52

50

CLEANFILES = mysqld_safe \

53

51

mysql_install_db \

Older »