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

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

1 files changed, 30 insertions, 0 deletions

diff --git a/storage/myisammrg/myrg_write.c b/storage/myisammrg/myrg_write.c
new file mode 100644
index 00000000..e511d60d
--- /dev/null
+++ b/storage/myisammrg/myrg_write.c
@@ -0,0 +1,30 @@
+/* Copyright (c) 2001, 2002, 2004-2007 MySQL AB
+   Use is subject to license terms
+
+   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 Street, Fifth Floor, Boston, MA  02110-1335  USA */
+
+/* Write a row to a MyISAM MERGE table */
+
+#include "myrg_def.h"
+
+int myrg_write(register MYRG_INFO *info, const uchar *rec)
+{
+  /* [phi] MERGE_WRITE_DISABLED is handled by the else case */
+  if (info->merge_insert_method == MERGE_INSERT_TO_FIRST)
+    return mi_write((info->current_table=info->open_tables)->table,rec);
+  else if (info->merge_insert_method == MERGE_INSERT_TO_LAST)
+    return mi_write((info->current_table=info->end_table-1)->table,rec);
+  else /* unsupported insertion method */
+    return (my_errno= HA_ERR_WRONG_COMMAND);
+}