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

into mysql.com:/home/dlenev/src/mysql-4.1-868

BitKeeper/etc/logging_ok

@@ -97,6 +97,7 @@ peter@linux.local
 peter@mysql.com
 peterg@mysql.com
 pgulutzan@linux.local
+ram@gw.mysql.r18.ru
 ram@gw.udmsearch.izhnet.ru
 ram@mysql.r18.ru
 ram@ram.(none)

extra/comp_err.c

@@ -71,14 +71,12 @@ int main(int argc,char *argv[])
       goto end;
     }
 
-#ifdef NEEDS_FIXES
     if (!(csnum= get_charset_number(charset_name, MY_CS_PRIMARY)))
     {
       fprintf(stderr,"Unknown character '%s' in '%s'\n",charset_name, *argv);
       fclose(from);
       goto end;
     }
-#endif
     
     if (remember_rows(from,'}') < 0)	/* Remember rows */
     {

include/m_ctype.h

@@ -63,6 +63,7 @@ typedef struct unicase_info_st
 #define MY_CS_STRNXFRM	64     /* if strnxfrm is used for sort   */
 #define MY_CS_UNICODE	128    /* is a charset is full unicode   */
 #define MY_CS_NONTEXT	256    /* if a charset is not sprintf() compatible */
+#define MY_CS_AVAILABLE	512    /* If either compiled-in or loaded*/
 
 #define MY_CHARSET_UNDEFINED 0
 

mysql-test/r/func_compress.result

@@ -40,3 +40,9 @@ uncompress(compress(""))
 select uncompressed_length("");
 uncompressed_length("")
 0
+select compress(NULL);
+compress(NULL)
+NULL
+select uncompress(NULL);
+uncompress(NULL)
+NULL

mysql-test/r/mysqldump.result

+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1(a int);
+INSERT INTO t1 VALUES (1), (2);
+<?xml version="1.0"?>
+<mysqldump>
+<database name="test">
+DROP TABLE IF EXISTS t1;
+LOCK TABLES t1 WRITE;
+	<table name="t1">
+	<row>
+		<field name="a">1</field>
+	</row>
+	<row>
+		<field name="a">2</field>
+	</row>
+	</table>
+UNLOCK TABLES;
+</database>
+</mysqldump>
+DROP TABLE t1;

mysql-test/t/func_compress.test

@@ -23,3 +23,9 @@ select uncompress("");
 select uncompress(compress(""));
 select uncompressed_length("");
 
+#
+# NULL (Bug #1333)
+#
+
+select compress(NULL);
+select uncompress(NULL);

mysql-test/t/mysqldump.test

+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+# XML output
+
+CREATE TABLE t1(a int);
+INSERT INTO t1 VALUES (1), (2);
+--exec $MYSQL_DUMP -X test t1
+DROP TABLE t1;

mysys/charset.c

@@ -226,7 +226,6 @@ static my_bool create_fromuni(CHARSET_INFO *cs)
 static void simple_cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from)
 {
   to->number= from->number ? from->number : to->number;
-  to->state|= from->state;
 
   if (from->csname)
     to->csname= my_once_strdup(from->csname,MYF(MY_WME));
@@ -282,8 +281,6 @@ static int add_collation(CHARSET_INFO *cs)
   {
     if (!all_charsets[cs->number])
     {
-      if (cs->state & MY_CS_COMPILED)
-        goto clear;
       if (!(all_charsets[cs->number]=
          (CHARSET_INFO*) my_once_alloc(sizeof(CHARSET_INFO),MYF(0))))
         return MY_XML_ERROR;
@@ -296,6 +293,8 @@ static int add_collation(CHARSET_INFO *cs)
     if (cs->binary_number == cs->number)
       cs->state |= MY_CS_BINSORT;
     
+    all_charsets[cs->number]->state|= cs->state;
+    
     if (!(all_charsets[cs->number]->state & MY_CS_COMPILED))
     {
       simple_cs_init_functions(all_charsets[cs->number]);
@@ -304,15 +303,14 @@ static int add_collation(CHARSET_INFO *cs)
       {
         all_charsets[cs->number]->state |= MY_CS_LOADED;
       }
+      all_charsets[cs->number]->state|= MY_CS_AVAILABLE;
     }
     else
     {
       CHARSET_INFO *dst= all_charsets[cs->number];
-      dst->state |= cs->state;
       if (cs->comment)
 	dst->comment= my_once_strdup(cs->comment,MYF(MY_WME));
     }
-clear:
     cs->number= 0;
     cs->primary_number= 0;
     cs->binary_number= 0;
@@ -389,77 +387,79 @@ char *get_charsets_dir(char *buf)
 CHARSET_INFO *all_charsets[256];
 CHARSET_INFO *default_charset_info = &my_charset_latin1;
 
-#define MY_ADD_CHARSET(x)	all_charsets[(x)->number]=(x)
+static void add_compiled_collation(CHARSET_INFO *cs)
+{
+  all_charsets[cs->number]= cs;
+  cs->state|= MY_CS_AVAILABLE;
+}
 
 
 static my_bool init_compiled_charsets(myf flags __attribute__((unused)))
 {
   CHARSET_INFO *cs;
 
-  MY_ADD_CHARSET(&my_charset_bin);
+  add_compiled_collation(&my_charset_bin);
   
-  MY_ADD_CHARSET(&my_charset_latin1);
-  MY_ADD_CHARSET(&my_charset_latin1_bin);
-  MY_ADD_CHARSET(&my_charset_latin1_german2_ci);
+  add_compiled_collation(&my_charset_latin1);
+  add_compiled_collation(&my_charset_latin1_bin);
+  add_compiled_collation(&my_charset_latin1_german2_ci);
 
 #ifdef HAVE_CHARSET_big5
-  MY_ADD_CHARSET(&my_charset_big5_chinese_ci);
-  MY_ADD_CHARSET(&my_charset_big5_bin);
+  add_compiled_collation(&my_charset_big5_chinese_ci);
+  add_compiled_collation(&my_charset_big5_bin);
 #endif
 
 #ifdef HAVE_CHARSET_cp1250
-  MY_ADD_CHARSET(&my_charset_cp1250_czech_ci);
+  add_compiled_collation(&my_charset_cp1250_czech_ci);
 #endif
 
 #ifdef HAVE_CHARSET_latin2
-  MY_ADD_CHARSET(&my_charset_latin2_czech_ci);
+  add_compiled_collation(&my_charset_latin2_czech_ci);
 #endif
 
 #ifdef HAVE_CHARSET_euckr
-  MY_ADD_CHARSET(&my_charset_euckr_korean_ci);
-  MY_ADD_CHARSET(&my_charset_euckr_bin);
+  add_compiled_collation(&my_charset_euckr_korean_ci);
+  add_compiled_collation(&my_charset_euckr_bin);
 #endif
 
 #ifdef HAVE_CHARSET_gb2312
-  MY_ADD_CHARSET(&my_charset_gb2312_chinese_ci);
-  MY_ADD_CHARSET(&my_charset_gb2312_bin);
+  add_compiled_collation(&my_charset_gb2312_chinese_ci);
+  add_compiled_collation(&my_charset_gb2312_bin);
 #endif
 
 #ifdef HAVE_CHARSET_gbk
-  MY_ADD_CHARSET(&my_charset_gbk_chinese_ci);
-  MY_ADD_CHARSET(&my_charset_gbk_bin);
+  add_compiled_collation(&my_charset_gbk_chinese_ci);
+  add_compiled_collation(&my_charset_gbk_bin);
 #endif
 
 #ifdef HAVE_CHARSET_sjis
-  MY_ADD_CHARSET(&my_charset_sjis_japanese_ci);
-  MY_ADD_CHARSET(&my_charset_sjis_bin);
+  add_compiled_collation(&my_charset_sjis_japanese_ci);
+  add_compiled_collation(&my_charset_sjis_bin);
 #endif
 
 #ifdef HAVE_CHARSET_tis620
-  MY_ADD_CHARSET(&my_charset_tis620_thai_ci);
-  MY_ADD_CHARSET(&my_charset_tis620_bin);
+  add_compiled_collation(&my_charset_tis620_thai_ci);
+  add_compiled_collation(&my_charset_tis620_bin);
 #endif
 
 #ifdef HAVE_CHARSET_ucs2
-  MY_ADD_CHARSET(&my_charset_ucs2_general_ci);
-  MY_ADD_CHARSET(&my_charset_ucs2_bin);
+  add_compiled_collation(&my_charset_ucs2_general_ci);
+  add_compiled_collation(&my_charset_ucs2_bin);
 #endif
 
 #ifdef HAVE_CHARSET_ujis
-  MY_ADD_CHARSET(&my_charset_ujis_japanese_ci);
-  MY_ADD_CHARSET(&my_charset_ujis_bin);
+  add_compiled_collation(&my_charset_ujis_japanese_ci);
+  add_compiled_collation(&my_charset_ujis_bin);
 #endif
 
 #ifdef HAVE_CHARSET_utf8
-  MY_ADD_CHARSET(&my_charset_utf8_general_ci);
-  MY_ADD_CHARSET(&my_charset_utf8_bin);
+  add_compiled_collation(&my_charset_utf8_general_ci);
+  add_compiled_collation(&my_charset_utf8_bin);
 #endif
 
   /* Copy compiled charsets */
   for (cs=compiled_charsets; cs->name; cs++)
-  {
-    all_charsets[cs->number]=cs;
-  }
+    add_compiled_collation(cs);
   
   return FALSE;
 }
@@ -570,7 +570,7 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
 
   cs= all_charsets[cs_number];
 
-  if (cs && !(cs->state & (MY_CS_COMPILED | MY_CS_LOADED)))
+  if (cs && !(cs->state & MY_CS_COMPILED) && !(cs->state & MY_CS_LOADED))
   {
      strxmov(get_charsets_dir(buf), cs->csname, ".xml", NullS);
      my_read_charset_file(buf,flags);

sql/derror.cc

@@ -67,10 +67,18 @@ static void read_texts(const char *file_name,const char ***point,
     goto err; /* purecov: inspected */
   textcount=head[4];
 
+  if (!head[30])
+  {
+    sql_print_error("No character set information in '%s'. \
+You probably haven't reinstalled the latest file version.",name);
+    goto err1;
+  }
+  
   if (!(cset= get_charset(head[30],MYF(MY_WME))))
   {
-    funktpos= 3;
-    goto err;
+    sql_print_error("Character set #%d is not supported for messagefile '%s'",
+                    (int)head[30],name);
+    goto err1;
   }
   
   length=uint2korr(head+6); count=uint2korr(head+8);
@@ -112,9 +120,6 @@ Check that the above file is the right version for this program!",
 
 err:
   switch (funktpos) {
-  case 3:
-    buff="Character set is not supported for messagefile '%s'";
-    break;
   case 2:
     buff="Not enough memory for messagefile '%s'";
     break;
@@ -125,9 +130,10 @@ Check that the above file is the right version for this program!",
     buff="Can't find messagefile '%s'";
     break;
   }
+  sql_print_error(buff,name);
+err1:
   if (file != FERR)
     VOID(my_close(file,MYF(MY_WME)));
-  sql_print_error(buff,name);
   unireg_abort(1);
 } /* read_texts */
 

sql/item_strfunc.cc

@@ -2539,6 +2539,11 @@ longlong Item_func_crc32::val_int()
 String *Item_func_compress::val_str(String *str)
 {
   String *res= args[0]->val_str(str);
+  if (!res)
+  {
+    null_value= 1;
+    return 0;
+  }
   if (res->is_empty()) return res;
 
   int err= Z_OK;
@@ -2589,6 +2594,11 @@ String *Item_func_compress::val_str(String *str)
 String *Item_func_uncompress::val_str(String *str)
 {
   String *res= args[0]->val_str(str);
+  if (!res)
+  {
+    null_value= 1;
+    return 0;
+  }
   if (res->is_empty()) return res;
 
   ulong new_size= uint4korr(res->c_ptr()) & 0x3FFFFFFF;

sql/sql_show.cc

@@ -1497,11 +1497,15 @@ int mysqld_show_collations(THD *thd, const char *wild)
   for ( cs= all_charsets ; cs < all_charsets+255 ; cs++ )
   {
     CHARSET_INFO **cl;
+    if (!cs[0] || !(cs[0]->state & MY_CS_AVAILABLE) || 
+        !(cs[0]->state & MY_CS_PRIMARY))
+      continue;
     for ( cl= all_charsets; cl < all_charsets+255 ;cl ++)
     {
-      if (!cs[0] || !cl[0] || !my_charset_same(cs[0],cl[0]) || !(cs[0]->state & MY_CS_PRIMARY))
+      if (!cl[0] || !(cl[0]->state & MY_CS_AVAILABLE) || 
+          !my_charset_same(cs[0],cl[0]))
 	continue;
-      if (cs[0] && !(wild && wild[0] &&
+      if (!(wild && wild[0] &&
 	  wild_case_compare(system_charset_info,cl[0]->name,wild)))
       {
         if (write_collation(protocol, cl[0]))
@@ -1545,8 +1549,10 @@ int mysqld_show_charsets(THD *thd, const char *wild)
 
   for ( cs= all_charsets ; cs < all_charsets+255 ; cs++ )
   {
-    if (cs[0] && (cs[0]->state & MY_CS_PRIMARY) && !(wild && wild[0] &&
-       wild_case_compare(system_charset_info,cs[0]->name,wild)))
+    if (cs[0] && (cs[0]->state & MY_CS_PRIMARY) && 
+        (cs[0]->state & MY_CS_AVAILABLE) &&
+        !(wild && wild[0] &&
+        wild_case_compare(system_charset_info,cs[0]->csname,wild)))
     {
       if (write_charset(protocol, cs[0]))
 	goto err;

strings/xml.c

@@ -255,7 +255,7 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
         if(MY_XML_EQ==(lex=my_xml_scan(p,&b)))
         {
           lex=my_xml_scan(p,&b);
-          if ( (lex==MY_XML_IDENT) || (lex=MY_XML_STRING) )
+          if ( (lex==MY_XML_IDENT) || (lex==MY_XML_STRING) )
           {
             if((MY_XML_OK!=my_xml_enter(p,a.beg,a.end-a.beg))  ||
                (MY_XML_OK!=my_xml_value(p,b.beg,b.end-b.beg))  ||