manual merge from mysql-trunk-bugfixing

Conflicts:
Text conflict in mysql-test/r/archive.result
Contents conflict in mysql-test/r/innodb_bug38231.result
Text conflict in mysql-test/r/mdl_sync.result
Text conflict in mysql-test/suite/binlog/t/disabled.def
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
Text conflict in mysql-test/t/archive.test
Contents conflict in mysql-test/t/innodb_bug38231.test
Text conflict in mysql-test/t/mdl_sync.test
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_show.cc
Text conflict in sql/table.cc
Text conflict in sql/table.h

1 files changed, 0 insertions, 48 deletions

diff --git a/strings/bcopy-duff.c b/strings/bcopy-duff.c
deleted file mode 100644
index 215857715fd..00000000000
--- a/strings/bcopy-duff.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* 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; 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#define IFACTOR 4
-
-  void
-dcopy(char *chardest, char *charsrc, int size)
-{
-  register int *src, *dest, intcount ;
-  int startcharcpy, intoffset, numints2cpy, i ;
-
-  numints2cpy = size >> 2 ;
-  startcharcpy = numints2cpy << 2 ;
-  intcount = numints2cpy & ~(IFACTOR-1) ;
-  intoffset = numints2cpy - intcount ;
-
-  src = (int *)(((int) charsrc) + intcount*sizeof(int*)) ;
-  dest = (int *)(((int) chardest) + intcount*sizeof(int*)) ;
-
-  /* copy the ints */
-  switch(intoffset)
-    do
-    {
-    case 0: dest[3] = src[3] ;
-    case 3: dest[2] = src[2] ;
-    case 2: dest[1] = src[1] ;
-    case 1: dest[0] = src[0] ;
-      intcount -= IFACTOR ;
-      dest -= IFACTOR ;
-      src -= IFACTOR ;
-    } while (intcount >= 0) ;
-
-  /* copy the chars left over by the int copy at the end */
-  for(i=startcharcpy ; i<size ; i++)
-    chardest[i] = charsrc[i] ;
-}