summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/suite/funcs_1/r/innodb_views.warnings2
-rw-r--r--mysql-test/suite/funcs_1/r/memory_views.warnings2
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_views.warnings2
-rw-r--r--scripts/make_binary_distribution.sh1
4 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.warnings b/mysql-test/suite/funcs_1/r/innodb_views.warnings
new file mode 100644
index 00000000000..2c9dc825a5d
--- /dev/null
+++ b/mysql-test/suite/funcs_1/r/innodb_views.warnings
@@ -0,0 +1,2 @@
+mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3039: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
+mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3050: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
diff --git a/mysql-test/suite/funcs_1/r/memory_views.warnings b/mysql-test/suite/funcs_1/r/memory_views.warnings
new file mode 100644
index 00000000000..2c9dc825a5d
--- /dev/null
+++ b/mysql-test/suite/funcs_1/r/memory_views.warnings
@@ -0,0 +1,2 @@
+mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3039: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
+mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3050: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
diff --git a/mysql-test/suite/funcs_1/r/myisam_views.warnings b/mysql-test/suite/funcs_1/r/myisam_views.warnings
new file mode 100644
index 00000000000..2c9dc825a5d
--- /dev/null
+++ b/mysql-test/suite/funcs_1/r/myisam_views.warnings
@@ -0,0 +1,2 @@
+mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3039: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
+mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3050: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 4791e048d7e..11430601d06 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -346,6 +346,7 @@ if [ x$NDBCLUSTER = x1 ]; then
$CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
$CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
$CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.
+ $CP $BASE/ndb-stage@pkgdatadir@/* $BASE/share/mysql/.
test -d $BASE/include/storage || mkdir $BASE/include/storage
$CP -r $BASE/ndb-stage@pkgincludedir@/storage/ndb $BASE/include/storage/
$CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1