Merge debian.(none):/M41/bug16635-4.1

into  debian.(none):/M41/push-4.1

sql/share/english/errmsg.txt

@@ -21,7 +21,7 @@ character-set=latin1
 "NO",
 "YES",
 "Can't create file '%-.64s' (errno: %d)",
-"Can't create table '%-.64s' (errno: %d)",
+"Can't create table '%-.150s' (errno: %d)",
 "Can't create database '%-.64s' (errno: %d)",
 "Can't create database '%-.64s'; database exists",
 "Can't drop database '%-.64s'; database doesn't exist",
@@ -33,7 +33,7 @@ character-set=latin1
 "Can't get working directory (errno: %d)",
 "Can't lock file (errno: %d)",
 "Can't open file: '%-.64s' (errno: %d)",
-"Can't find file: '%-.64s' (errno: %d)",
+"Can't find file: '%-.150s' (errno: %d)",
 "Can't read dir of '%-.64s' (errno: %d)",
 "Can't change dir to '%-.64s' (errno: %d)",
 "Record has changed since last read in table '%-.64s'",
@@ -41,7 +41,7 @@ character-set=latin1
 "Can't write; duplicate key in table '%-.64s'",
 "Error on close of '%-.64s' (errno: %d)",
 "Error reading file '%-.64s' (errno: %d)",
-"Error on rename of '%-.64s' to '%-.64s' (errno: %d)",
+"Error on rename of '%-.107s' to '%-.107s' (errno: %d)",
 "Error writing file '%-.64s' (errno: %d)",
 "'%-.64s' is locked against change",
 "Sort aborted",