summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2005-04-19 17:18:56 +0200
committerunknown <lenz@mysql.com>2005-04-19 17:18:56 +0200
commit33ea3ff34525129f896ef431185cef60f259ee21 (patch)
tree880a2435dfe5482cb5bdfb287417601d8ea5600e /libmysqld
parent254dfb2be0075b15af30778b51321f784bf45ef5 (diff)
parent1f1a579aa929cf7f0dd0870557e7e62d9e60b2d2 (diff)
downloadmariadb-git-33ea3ff34525129f896ef431185cef60f259ee21.tar.gz
- manual merge
sql/share/Makefile.am: Auto merged
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/examples/Makefile.am16
1 files changed, 16 insertions, 0 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index 51a7252440a..278aa66b328 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -1,3 +1,19 @@
+# Copyright (C) 2000 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
noinst_PROGRAMS = mysql
bin_PROGRAMS = mysqltest_embedded mysql_client_test_embedded
client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)