Commit 61e9e1f7 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
parents 4c8010e3 aedf161d

mysql-test/suite/funcs_1/r/innodb_views.warnings

0 → 100644
+2 −0
Original line number Diff line number Diff line 
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

mysql-test/suite/funcs_1/r/memory_views.warnings

0 → 100644
+2 −0
Original line number Diff line number Diff line 
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

mysql-test/suite/funcs_1/r/myisam_views.warnings

0 → 100644
+2 −0
Original line number Diff line number Diff line 
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

scripts/make_binary_distribution.sh

+1 −0
Original line number Diff line number Diff line
@@ -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