Merge branch '10.1' into 10.2

This commit is contained in:
Sergei Golubchik 2017-03-30 12:48:42 +02:00
commit da4d71d10d
1708 changed files with 29498 additions and 15585 deletions

View file

@ -13,7 +13,7 @@
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 */
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
/* This file is to be include first in all files in the string directory */

View file

@ -40,6 +40,7 @@
char *strmov(register char *dst, register const char *src)
{
DBUG_ASSERT(src + strlen(src) < dst || dst + strlen(src) < src);
while ((*dst++ = *src++)) ;
return dst-1;
}

View file

@ -11,7 +11,7 @@
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 */
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
#include "strings_def.h"