Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 51 insertions, 0 deletions

diff --git a/sql/sql_do.cc b/sql/sql_do.cc
new file mode 100644
index 00000000..5a7bca27
--- /dev/null
+++ b/sql/sql_do.cc
@@ -0,0 +1,51 @@
+/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+   
+   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; version 2 of the License.
+   
+   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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+
+/* Execute DO statement */
+
+#include "mariadb.h"
+#include "sql_priv.h"
+#include "transaction.h"
+#include "unireg.h"
+#include "sql_do.h"
+#include "sql_base.h"                           // setup_fields
+#include "sql_select.h"                         // free_underlaid_joins
+
+bool mysql_do(THD *thd, List<Item> &values)
+{
+  List_iterator<Item> li(values);
+  Item *value;
+  DBUG_ENTER("mysql_do");
+  if (setup_fields(thd, Ref_ptr_array(), values, COLUMNS_READ, 0, NULL, 0))
+    DBUG_RETURN(TRUE);
+  while ((value = li++))
+    (void) value->is_null();
+  free_underlaid_joins(thd, thd->lex->first_select_lex());
+
+  if (unlikely(thd->is_error()))
+  {
+    /*
+      Rollback the effect of the statement, since next instruction
+      will clear the error and the rollback in the end of
+      mysql_execute_command() won't work.
+    */
+    if (! thd->in_sub_stmt)
+      trans_rollback_stmt(thd);
+    thd->clear_error(); // DO always is OK
+  }
+  my_ok(thd);
+  DBUG_RETURN(FALSE);
+}