Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp

1 files changed, 0 insertions, 63 deletions

diff --git a/dep/mysqllite/mysys/mulalloc.c b/dep/mysqllite/mysys/mulalloc.c
deleted file mode 100644
index f4ca3d9f9ab..00000000000
--- a/dep/mysqllite/mysys/mulalloc.c
+++ /dev/null
@@ -1,63 +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 */
-
-#include "mysys_priv.h"
-#include <stdarg.h>
-
-/*
-  Malloc many pointers at the same time
-  Only ptr1 can be free'd, and doing this will free all
-  the memory allocated. ptr2, etc all point inside big allocated
-  memory area.
-
-  SYNOPSIS
-    my_multi_malloc()
-      myFlags              Flags
-	ptr1, length1      Multiple arguments terminated by null ptr
-	ptr2, length2      ...
-        ...
-	NULL
-*/
-
-void* my_multi_malloc(myf myFlags, ...)
-{
-  va_list args;
-  char **ptr,*start,*res;
-  size_t tot_length,length;
-  DBUG_ENTER("my_multi_malloc");
-
-  va_start(args,myFlags);
-  tot_length=0;
-  while ((ptr=va_arg(args, char **)))
-  {
-    length=va_arg(args,uint);
-    tot_length+=ALIGN_SIZE(length);
-  }
-  va_end(args);
-
-  if (!(start=(char *) my_malloc(tot_length,myFlags)))
-    DBUG_RETURN(0); /* purecov: inspected */
-
-  va_start(args,myFlags);
-  res=start;
-  while ((ptr=va_arg(args, char **)))
-  {
-    *ptr=res;
-    length=va_arg(args,uint);
-    res+=ALIGN_SIZE(length);
-  }
-  va_end(args);
-  DBUG_RETURN((void*) start);
-}