bk commit into 5.1 tree (bar:1.2068)

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2068 06/01/18 12:27:02 bar@stripped +4 -0
  sql_show.cc:
    Don't display charsets/collations with HIDDEN flag.
  ctype-utf8.c:
    Adding HIDDEN flag to "filename"
    Changeing ID to 17 which was previosly
    used by deprecated "win1251", removed in 4.1.
  charset-def.c:
    Adding "filename" as a hidden charset, for test purposes.
  m_ctype.h:
    Adding MY_CS_HIDDEN flag,
    to hide charsets and collations from
    being displayed in SHOW.

  sql/sql_show.cc
    1.292 06/01/18 12:24:35 bar@stripped +2 -0
    Don't display charsets/collations with HIDDEN flag.

  strings/ctype-utf8.c
    1.99 06/01/18 12:23:28 bar@stripped +2 -2
    Adding HIDDEN flag to "filename"
    Changeing ID to 17 which was previosly
    used by deprecated "win1251", removed in 4.1.

  mysys/charset-def.c
    1.16 06/01/18 12:23:02 bar@stripped +1 -0
    Adding "filename" as a hidden charset, for test purposes.

  include/m_ctype.h
    1.117 06/01/18 12:22:23 bar@stripped +2 -1
    Adding MY_CS_HIDDEN flag,
    to hide charsets and collations from
    being displayed in SHOW.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-new.12448

--- 1.116/include/m_ctype.h	2005-12-31 08:47:39 +04:00
+++ 1.117/include/m_ctype.h	2006-01-18 12:22:23 +04:00
@@ -66,7 +66,8 @@
 #define MY_CS_UNICODE	128    /* is a charset is full unicode   */
 #define MY_CS_READY	256    /* if a charset is initialized    */
 #define MY_CS_AVAILABLE	512    /* If either compiled-in or loaded*/
-#define MY_CS_CSSORT	1024   /* if case sensitive sort order   */	
+#define MY_CS_CSSORT	1024   /* if case sensitive sort order   */
+#define MY_CS_HIDDEN	2048   /* don't display in SHOW          */	
 #define MY_CHARSET_UNDEFINED 0
 
 

--- 1.291/sql/sql_show.cc	2006-01-17 11:37:27 +04:00
+++ 1.292/sql/sql_show.cc	2006-01-18 12:24:35 +04:00
@@ -2835,6 +2835,7 @@
     CHARSET_INFO *tmp_cs= cs[0];
     if (tmp_cs && (tmp_cs->state & MY_CS_PRIMARY) && 
         (tmp_cs->state & MY_CS_AVAILABLE) &&
+        !(tmp_cs->state & MY_CS_HIDDEN) &&
         !(wild && wild[0] &&
 	  wild_case_compare(scs, tmp_cs->csname,wild)))
     {
@@ -2904,6 +2905,7 @@
     CHARSET_INFO **cl;
     CHARSET_INFO *tmp_cs= cs[0];
     if (!tmp_cs || !(tmp_cs->state & MY_CS_AVAILABLE) || 
+         (tmp_cs->state & MY_CS_HIDDEN) ||
         !(tmp_cs->state & MY_CS_PRIMARY))
       continue;
     for (cl= all_charsets; cl < all_charsets+255 ;cl ++)

--- 1.98/strings/ctype-utf8.c	2005-12-31 08:56:53 +04:00
+++ 1.99/strings/ctype-utf8.c	2006-01-18 12:23:28 +04:00
@@ -4048,8 +4048,8 @@
 
 CHARSET_INFO my_charset_filename=
 {
-    33,0,0,             /* number       */
-    MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE,  /* state  */
+    17,0,0,             /* number       */
+    MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_HIDDEN,
     "filename",         /* cs name      */
     "filename",         /* name         */
     "",                 /* comment      */

--- 1.15/mysys/charset-def.c	2005-12-23 14:19:10 +04:00
+++ 1.16/mysys/charset-def.c	2006-01-18 12:23:02 +04:00
@@ -78,6 +78,7 @@
   CHARSET_INFO *cs;
 
   add_compiled_collation(&my_charset_bin);
+  add_compiled_collation(&my_charset_filename);
   
   add_compiled_collation(&my_charset_latin1);
   add_compiled_collation(&my_charset_latin1_bin);