merge with 3.23.51

BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Docs/manual.texi:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/t/type_enum.test:
  Auto merged
mysys/mf_strip.c:
  Auto merged
mysys/raid.cc:
  Auto merged
include/my_net.h:
  merge
mysql-test/r/type_enum.result:
  merge
mysql-test/t/type_decimal.test:
  merge
mysys/Makefile.am:
  merge
sql/sql_db.cc:
  merge
sql/sql_parse.cc:
  merge

1 files changed, 46 insertions, 0 deletions

diff --git a/mysys/mf_strip.c b/mysys/mf_strip.c
new file mode 100644
index 00000000000..ef2aab2c0a3
--- /dev/null
+++ b/mysys/mf_strip.c
@@ -0,0 +1,46 @@
+/* Copyright (C) 2000 MySQL 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 */
+
+/* T|mmer en str{ng p{ slut_space */
+
+#include "mysys_priv.h"
+
+/*
+	strip_sp(my_string str)
+	Strips end-space from string and returns new length.
+*/
+
+size_s strip_sp(register my_string str)
+{
+  reg2 my_string found;
+  reg3 my_string start;
+
+  start=found=str;
+
+  while (*str)
+  {
+    if (*str != ' ')
+    {
+      while (*++str && *str != ' ') {};
+      if (!*str)
+	return (size_s) (str-start);	/* Return stringlength */
+    }
+    found=str;
+    while (*++str == ' ') {};
+  }
+  *found= '\0';				/* Stripp at first space */
+  return (size_s) (found-start);
+} /* strip_sp */