Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item_strfunc.cc:
  Auto merged

VC++Files/libmysql/libmysql.def

@@ -1,117 +0,0 @@
-LIBRARY		LIBMYSQL
-DESCRIPTION	'MySQL 4.0 Client Library'
-VERSION		4.0
-EXPORTS
-	mysql_affected_rows
-	mysql_close
-	mysql_data_seek
-	mysql_debug
-	mysql_dump_debug_info
-	mysql_eof
-	mysql_errno
-	mysql_error
-	mysql_escape_string
-	mysql_fetch_field
-	mysql_fetch_field_direct
-	mysql_fetch_fields
-	mysql_fetch_lengths
-	mysql_fetch_row
-	mysql_field_count
-	mysql_field_seek
-	mysql_field_tell
-	mysql_free_result
-	mysql_get_client_info
-	mysql_get_host_info
-	mysql_get_proto_info
-	mysql_get_server_info
-	mysql_info
-	mysql_init
-	mysql_insert_id
-	mysql_kill
-	mysql_list_dbs
-	mysql_list_fields
-	mysql_list_processes
-	mysql_list_tables
-	mysql_num_fields
-	mysql_num_rows
-	mysql_odbc_escape_string
-	mysql_options
-	mysql_ping
-	mysql_query
-	mysql_real_connect
-	mysql_real_query
-	mysql_refresh
-	mysql_row_seek
-	mysql_row_tell
-	mysql_select_db
-	mysql_shutdown
-	mysql_stat
-	mysql_store_result
-	mysql_thread_id
-	mysql_use_result
-	bmove_upp
-	delete_dynamic
-	_dig_vec
-	init_dynamic_array
-	insert_dynamic
-	int2str
-	is_prefix
-	list_add
-	list_delete
-	max_allowed_packet
-	my_init
-	my_end
-	my_strdup
-	my_malloc
-	my_memdup
-	my_no_flags_free
-	my_realloc
-	my_thread_end
-	my_thread_init
-	net_buffer_length
-	set_dynamic
-	strcend
-	strdup_root
-	strfill
-	strinstr
-	strmake
-	strmov
-	strxmov
-	myodbc_remove_escape
-	mysql_thread_safe
-	mysql_character_set_name
-	mysql_change_user
-	mysql_send_query
-	mysql_read_query_result
-	mysql_real_escape_string
-	mysql_ssl_set
-	mysql_real_connect
-	mysql_master_query
-	mysql_master_send_query
-	mysql_slave_query
-	mysql_slave_send_query
-	mysql_enable_rpl_parse
-	mysql_disable_rpl_parse
-	mysql_rpl_parse_enabled
-	mysql_enable_reads_from_master
-	mysql_disable_reads_from_master
-	mysql_reads_from_master_enabled
-	mysql_rpl_query_type
-	mysql_rpl_probe
-	mysql_set_master
-	mysql_add_slave
-
-	
-	
-	
-	
-	
-	
-
-	
-
-
-
-
-
-

bdb/dist/s_all

@@ -20,4 +20,4 @@ sh s_win32_dsp		# Win32 build environment.
 #sh s_vxworks		# VxWorks include files.
 #sh s_java		# Java support.
 sh s_test		# Test suite support.
-#sh s_tags		# Tags files.
+sh s_tags		# Tags files.

include/mysqld_error.h

@@ -270,5 +270,10 @@
 #define ER_COLLATION_CHARSET_MISMATCH 1251
 #define ER_SLAVE_WAS_RUNNING 1252
 #define ER_SLAVE_WAS_NOT_RUNNING 1253
-#define ER_CUT_VALUE_GROUP_CONCAT 1254
-#define ER_ERROR_MESSAGES 255
+#define ER_TOO_BIG_FOR_UNCOMPRESS 1254
+#define ER_ZLIB_Z_MEM_ERROR 1255
+#define ER_ZLIB_Z_BUF_ERROR 1256
+#define ER_ZLIB_Z_DATA_ERROR 1257
+#define ER_CUT_VALUE_GROUP_CONCAT 1258
+#define ER_ERROR_MESSAGES 259
+

libmysql/libmysql.def

@@ -122,6 +122,8 @@ EXPORTS
         mysql_commit
         mysql_rollback
         mysql_autocommit
+        load_defaults
+        free_defaults
   
   
 	

mysql-test/include/have_compress.inc

@@ -0,0 +1,4 @@
+-- require r/have_compress.require
+disable_query_log;
+show variables like "have_compress";
+enable_query_log;

mysql-test/r/func_compress.result

@@ -0,0 +1,35 @@
+select @test_compress_string:='string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ';
+@test_compress_string:='string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa '
+string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
+select length(@test_compress_string);
+length(@test_compress_string)
+117
+select uncompress(compress(@test_compress_string));
+uncompress(compress(@test_compress_string))
+string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
+select uncompress(@test_compress_string);
+uncompress(@test_compress_string)
+NULL
+Warnings:
+Error	1254	Too big size of uncompressed data. The maximum size is 8192. (probably, length of uncompressed data was corrupted)
+select uncompressed_length(compress(@test_compress_string))=length(@test_compress_string);
+uncompressed_length(compress(@test_compress_string))=length(@test_compress_string)
+1
+select uncompressed_length(compress(@test_compress_string));
+uncompressed_length(compress(@test_compress_string))
+117
+select length(compress(@test_compress_string))<length(@test_compress_string);
+length(compress(@test_compress_string))<length(@test_compress_string)
+1
+create table t1 (a text, b char(255), c char(4)) type=myisam;
+insert into t1 (a,b,c) values (compress(@test_compress_string),compress(@test_compress_string),'d ');
+select uncompress(a) from t1;
+uncompress(a)
+string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
+select uncompress(b) from t1;
+uncompress(b)
+string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
+select concat('|',c,'|') from t1;
+concat('|',c,'|')
+|d|
+drop table t1;

mysql-test/r/func_gconcat.result

@@ -150,10 +150,10 @@ grp	group_concat(c)
 4	
 5	NULL
 Warnings:
-Warning	1254	1 line(s) was(were) cut by group_concat()
+Warning	1258	1 line(s) was(were) cut by group_concat()
 show warnings;
 Level	Code	Message
-Warning	1254	1 line(s) was(were) cut by group_concat()
+Warning	1258	1 line(s) was(were) cut by group_concat()
 select group_concat(sum(a)) from t1 group by grp;
 Invalid use of group function
 select grp,group_concat(c order by 2) from t1 group by grp;

mysql-test/r/have_compress.require

@@ -0,0 +1,2 @@
+Variable_name	Value
+have_compress	YES

mysql-test/t/func_compress.test

@@ -0,0 +1,20 @@
+-- source include/have_compress.inc
+#
+# Test for compress and uncompress functions:
+#
+
+select @test_compress_string:='string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ';
+select length(@test_compress_string);
+
+select uncompress(compress(@test_compress_string));
+select uncompress(@test_compress_string);
+select uncompressed_length(compress(@test_compress_string))=length(@test_compress_string);
+select uncompressed_length(compress(@test_compress_string));
+select length(compress(@test_compress_string))<length(@test_compress_string);
+
+create table t1 (a text, b char(255), c char(4)) type=myisam;
+insert into t1 (a,b,c) values (compress(@test_compress_string),compress(@test_compress_string),'d ');
+select uncompress(a) from t1;
+select uncompress(b) from t1;
+select concat('|',c,'|') from t1;
+drop table t1;

sql/item_create.cc

@@ -645,3 +645,23 @@ Item *create_func_point(Item *a, Item *b)
 {
   return new Item_func_point(a, b);
 }
+
+#ifdef HAVE_COMPRESS
+
+Item *create_func_compress(Item* a)
+{
+  return new Item_func_compress(a);
+}
+
+Item *create_func_uncompress(Item* a)
+{
+  return new Item_func_uncompress(a);
+}
+
+Item *create_func_uncompressed_length(Item* a)
+{
+  return new Item_func_uncompressed_length(a);
+}
+
+#endif
+

sql/item_create.h

@@ -141,3 +141,10 @@ Item *create_func_numinteriorring(Item *a);
 Item *create_func_numgeometries(Item *a);
 
 Item *create_func_point(Item *a, Item *b);
+
+#ifdef HAVE_COMPRESS
+Item *create_func_compress(Item *a);
+Item *create_func_uncompress(Item *a);
+Item *create_func_uncompressed_length(Item *a);
+#endif
+

sql/item_func.cc

@@ -983,8 +983,20 @@ longlong Item_func_crc32::val_int()
   null_value=0;
   return (longlong) crc32(0L, (Bytef*)res->ptr(), res->length());
 }
-#endif /* HAVE_COMPRESS */
 
+longlong Item_func_uncompressed_length::val_int()
+{
+  String *res= args[0]->val_str(&value);
+  if (!res)
+  {
+    null_value=1;
+    return 0; /* purecov: inspected */
+  }
+  null_value=0;
+  return uint4korr(res->c_ptr());
+}
+
+#endif /* HAVE_COMPRESS */
 
 longlong Item_func_length::val_int()
 {

sql/item_func.h

@@ -559,6 +559,15 @@ public:
   const char *func_name() const { return "crc32"; }
   void fix_length_and_dec() { max_length=10; }
 };
+class Item_func_uncompressed_length : public Item_int_func 
+{
+  String value;
+public:
+  Item_func_uncompressed_length(Item *a):Item_int_func(a){}
+  longlong val_int();
+  const char *func_name() const{return "uncompressed_length";}
+  void fix_length_and_dec() { max_length=10; }
+};
 #endif
 
 class Item_func_length :public Item_int_func

sql/item_strfunc.cc

@@ -2918,3 +2918,91 @@ String *Item_func_spatial_collection::val_str(String *str)
 ret:
   return null_value ? 0 : str;
 }
+
+#ifdef HAVE_COMPRESS
+#include <zlib.h>
+
+String *Item_func_compress::val_str(String *str)
+{
+  String *res= args[0]->val_str(str);
+  int err= Z_OK;
+  int code;
+
+  /*
+   citation from zlib.h (comment for compress function):
+
+    Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be at least 0.1% larger than
+   sourceLen plus 12 bytes.
+
+   Proportion 120/100 founded by Sinica with help of procedure
+   compress(compress(compress(...)))
+   I.e. zlib give number 'at least'..
+  */
+  uLongf new_size= (uLongf)((res->length()*120)/100)+12;
+
+  buffer.realloc((uint32)new_size+sizeof(int32)+sizeof(char));
+
+  Byte *body= ((Byte*)buffer.c_ptr())+sizeof(int32);
+  err= compress(body, &new_size,(const Bytef*)res->c_ptr(), res->length());
+  
+  if (err != Z_OK)
+  {
+    code= err==Z_MEM_ERROR ? ER_ZLIB_Z_MEM_ERROR : ER_ZLIB_Z_BUF_ERROR;
+    push_warning(current_thd,MYSQL_ERROR::WARN_LEVEL_ERROR,code,ER(code));
+    null_value= 1;
+    return 0;
+  }
+  
+  int4store(buffer.c_ptr(),res->length());
+  buffer.length((uint32)new_size+sizeof(int32));
+  
+  /* This is for the stupid char fields which trimm ' ': */
+  char *last_char= ((char*)body)+new_size-1;
+  if (*last_char == ' ')
+  {
+    *++last_char= '.';
+    new_size++;
+  }
+  
+  buffer.length((uint32)new_size+sizeof(int32));
+  
+  return &buffer;
+}
+
+String *Item_func_uncompress::val_str(String *str)
+{
+  String *res= args[0]->val_str(str);
+  uLongf new_size= uint4korr(res->c_ptr());
+  int err= Z_OK;
+  uint code;
+  
+  if (new_size > MAX_BLOB_WIDTH)
+  {
+    push_warning_printf(current_thd,MYSQL_ERROR::WARN_LEVEL_ERROR,
+			ER_TOO_BIG_FOR_UNCOMPRESS,
+			ER(ER_TOO_BIG_FOR_UNCOMPRESS),MAX_BLOB_WIDTH);
+    null_value= 1;
+    return 0;
+  }
+  
+  buffer.realloc((uint32)new_size);
+  
+  err= uncompress((Byte*)buffer.c_ptr(), &new_size, 
+		  ((const Bytef*)res->c_ptr())+sizeof(int32),res->length());
+  
+  if (err == Z_OK)
+  {
+    buffer.length((uint32)new_size);
+    return &buffer;
+  }
+  
+  code= err==Z_BUF_ERROR ? ER_ZLIB_Z_BUF_ERROR : 
+    err==Z_MEM_ERROR ? ER_ZLIB_Z_MEM_ERROR : ER_ZLIB_Z_DATA_ERROR;
+  push_warning(current_thd,MYSQL_ERROR::WARN_LEVEL_ERROR,code,ER(code));
+  null_value= 1;
+  return 0;
+}
+
+#endif

sql/item_strfunc.h

@@ -781,6 +781,29 @@ public:
   const char *func_name() const { return "multipoint"; }
 };
 
+#ifdef HAVE_COMPRESS
+
+class Item_func_compress : public Item_str_func
+{
+  String buffer;
+public:
+  Item_func_compress(Item *a):Item_str_func(a){}
+  String *val_str(String *);
+  void fix_length_and_dec(){max_length= (args[0]->max_length*120)/100+12;}
+  const char *func_name() const{return "compress";}
+};
+
+class Item_func_uncompress : public Item_str_func 
+{
+  String buffer;
+public:
+  Item_func_uncompress(Item *a):Item_str_func(a){}
+  String *val_str(String *);
+  void fix_length_and_dec(){max_length= MAX_BLOB_WIDTH;}
+  const char *func_name() const{return "uncompress";}
+};
+
+#endif
 
 /*
 class Item_func_multipoint :public Item_str_func

sql/lex.h

@@ -447,6 +447,9 @@ static SYMBOL sql_functions[] = {
   { "CHARACTER_LENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_char_length)},
   { "COALESCE",		SYM(COALESCE),0,0},
   { "COERCIBILITY",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_coercibility)},
+#ifdef HAVE_COMPRESS
+  { "COMPRESS",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_compress)},
+#endif
   { "CONCAT",		SYM(CONCAT),0,0},
   { "CONCAT_WS",	SYM(CONCAT_WS),0,0},
   { "CONNECTION_ID",	SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_connection_id)},
@@ -623,6 +626,10 @@ static SYMBOL sql_functions[] = {
   { "TOUCHES",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_touches)},
   { "TRIM",		SYM(TRIM),0,0},
   { "UCASE",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ucase)},
+#ifdef HAVE_COMPRESS
+  { "UNCOMPRESS",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_uncompress)},
+  { "UNCOMPRESSED_LENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_uncompressed_length)},
+#endif
   { "UNIQUE_USERS",	SYM(UNIQUE_USERS),0,0},
   { "UNIX_TIMESTAMP",	SYM(UNIX_TIMESTAMP),0,0},
   { "UPPER",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ucase)},

sql/mysql_priv.h

@@ -772,6 +772,7 @@ extern SHOW_COMP_OPTION have_isam, have_innodb, have_berkeley_db;
 extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink;
 extern SHOW_COMP_OPTION have_query_cache, have_berkeley_db, have_innodb;
 extern SHOW_COMP_OPTION have_crypt;
+extern SHOW_COMP_OPTION have_compress;
 
 #ifndef __WIN__
 extern pthread_t signal_thread;

sql/mysqld.cc

@@ -257,6 +257,11 @@ SHOW_COMP_OPTION have_crypt=SHOW_OPTION_YES;
 #else
 SHOW_COMP_OPTION have_crypt=SHOW_OPTION_NO;
 #endif
+#ifdef HAVE_COMPRESS
+SHOW_COMP_OPTION have_compress= SHOW_OPTION_YES;
+#else
+SHOW_COMP_OPTION have_compress= SHOW_OPTION_NO;
+#endif
 
 const char *show_comp_option_name[]= {"YES", "NO", "DISABLED"};
 

sql/set_var.cc

@@ -474,6 +474,7 @@ struct show_var_st init_vars[]= {
   {"ft_stopword_file",        (char*) &ft_stopword_file,            SHOW_CHAR_PTR},
   {"have_bdb",		      (char*) &have_berkeley_db,	    SHOW_HAVE},
   {"have_crypt",	      (char*) &have_crypt,		    SHOW_HAVE},
+  {"have_compress",	      (char*) &have_compress,		    SHOW_HAVE},
   {"have_innodb",	      (char*) &have_innodb,		    SHOW_HAVE},
   {"have_isam",	      	      (char*) &have_isam,		    SHOW_HAVE},
   {"have_raid",		      (char*) &have_raid,		    SHOW_HAVE},

sql/share/czech/errmsg.txt

@@ -264,4 +264,8 @@ v/*
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
 "%d line(s) was(were) cut by group_concat()"

sql/share/danish/errmsg.txt

@@ -258,4 +258,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/dutch/errmsg.txt

@@ -266,4 +266,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/english/errmsg.txt

@@ -255,4 +255,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/estonian/errmsg.txt

@@ -260,4 +260,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/french/errmsg.txt

@@ -255,4 +255,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/german/errmsg.txt

@@ -264,4 +264,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/greek/errmsg.txt

@@ -255,4 +255,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/hungarian/errmsg.txt

@@ -257,4 +257,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/italian/errmsg.txt

@@ -255,4 +255,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/japanese/errmsg.txt

@@ -257,4 +257,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/korean/errmsg.txt

@@ -255,4 +255,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/norwegian-ny/errmsg.txt

@@ -257,4 +257,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/norwegian/errmsg.txt

@@ -257,4 +257,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/polish/errmsg.txt

@@ -259,4 +259,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/portuguese/errmsg.txt

@@ -255,4 +255,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/romanian/errmsg.txt

@@ -259,4 +259,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
 "%d line(s) was(were) cut by group_concat()"

sql/share/russian/errmsg.txt

@@ -257,4 +257,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/serbian/errmsg.txt

@@ -251,4 +251,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/slovak/errmsg.txt

@@ -263,4 +263,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/spanish/errmsg.txt

@@ -256,4 +256,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"

sql/share/swedish/errmsg.txt

@@ -255,4 +255,8 @@
 "COLLATION '%s' är inte tillåtet för CHARACTER SET '%s'"
 "Slaven har redan startat"
 "Slaven har redan stoppat"
-"%d rad(er) kapades av group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d rad(er) kapades av group_concat()"

sql/share/ukrainian/errmsg.txt

@@ -260,4 +260,8 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
-"%d line(s) was(were) cut by group_concat()"
+"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
+"Z_BUF_ERROR: Not enough memory available for zlib"
+"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_DATA_ERROR: Input data was corrupted for zlib"
+"%d line(s) was(were) cut by group_concat()"