Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105)

Don't dump data for MRG_ISAM or MRG_MYISAM tables. (Bug #1846)
Ensure that 'lower_case_table_names' is always set on case insensitive file systems. (Bug #1812)
One can now configure MySQL as windows service as a normal user. (Bug #1802)
Database names is now compared with lower case in ON clause when lower_case_table_names is set. (Bug #1736)
IGNORE ... LINES option didn't work when used with fixed length rows. (Bug #1704)
Change INSERT DELAYED ... SELECT... to INSERT .... SELECT (Bug #1983)
Safety fix for service 'mysql start' (Bug #1815)

1 files changed, 12 insertions, 6 deletions

diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index edadadf3a43..7ffc83ea005 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -538,8 +538,10 @@ int my_strnncoll_tis620(const uchar * s1, int len1, const uchar * s2, int len2)
   tc1= thai2sortable(s1, len1);
   tc2= thai2sortable(s2, len2);
   i= strcmp((char*)tc1, (char*)tc2);
-  free(tc1);
-  free(tc2);
+  if (tc1 != s1)
+    free(tc1);
+  if (tc2 != s2)
+    free(tc2);
   return i;
 }
 
@@ -555,7 +557,8 @@ int my_strnxfrm_tis620(uchar * dest, const uchar * src, int len, int srclen)
   tmp= thai2sortable(src,srclen);
   set_if_smaller(bufSize,(uint) len);
   memcpy((uchar *)dest, tmp, bufSize);
-  free(tmp);
+  if (tmp != src)
+    free(tmp);
   return (int)bufSize;
 }
 
@@ -570,8 +573,10 @@ int my_strcoll_tis620(const uchar * s1, const uchar * s2)
   tc1= thai2sortable(s1, (int) strlen((char*)s1));
   tc2= thai2sortable(s2, (int) strlen((char*)s2));
   i= strcmp((char*)tc1, (char*)tc2);
-  free(tc1);
-  free(tc2);
+  if (tc1 != s1)
+    free(tc1);
+  if (tc2 != s2)
+    free(tc2);
   return i;
 }
 
@@ -587,7 +592,8 @@ int my_strxfrm_tis620(uchar * dest, const uchar * src, int len)
   bufSize= (uint)buffsize((char*) src);
   tmp= thai2sortable(src, len);
   memcpy((uchar *)dest, tmp, bufSize);
-  free(tmp);
+  if (tmp != src)
+    free(tmp);
   return bufSize;
 }