merge with 3.23.47 (DO statement)

innobase/dict/dict0dict.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
Docs/manual.texi:
  merge
sql/Makefile.am:
  merge
sql/mysql_priv.h:
  merge
sql/sql_lex.h:
  merge
sql/sql_yacc.yy:
  merge

1 files changed, 35 insertions, 0 deletions

diff --git a/sql/sql_do.cc b/sql/sql_do.cc
new file mode 100644
index 00000000000..8e197b47fd5
--- /dev/null
+++ b/sql/sql_do.cc
@@ -0,0 +1,35 @@
+/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
+
+
+/* Execute DO statement */
+
+#include "mysql_priv.h"
+#include "sql_acl.h"
+
+int mysql_do(THD *thd, List<Item> &values)
+{
+  int error;
+  List_iterator<Item> li(values);
+  Item *value;
+  DBUG_ENTER("mysql_do");
+  if (setup_fields(thd,0, values, 0, 0))
+    DBUG_RETURN(-1);
+  while ((value = li++))
+    value->val_int();
+  send_ok(&thd->net);
+  DBUG_RETURN(0);
+}