bk commit into 5.2 tree (cmiller:1.2601)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.2 repository of cmiller. When cmiller 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@stripped, 2007-10-09 15:30:49-04:00, cmiller@stripped +2 -0
  Fixed old merge cruft.

  client/mysql.cc@stripped, 2007-10-09 15:30:46-04:00, cmiller@stripped +1 -1
    Fixed reference to recently-removed gptr.

  strings/ctype-uca.c@stripped, 2007-10-09 15:30:46-04:00, cmiller@stripped +2 -34
    Removed duplicate addition of Sinhala.

diff -Nrup a/client/mysql.cc b/client/mysql.cc
--- a/client/mysql.cc	2007-10-09 12:32:18 -04:00
+++ b/client/mysql.cc	2007-10-09 15:30:46 -04:00
@@ -622,7 +622,7 @@ static struct my_option my_long_options[
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
    {"auto-vertical-output", OPT_AUTO_VERTICAL_OUTPUT,
     "Automatically switch to vertical output mode if the result is wider than the
terminal width.",
-    (gptr*) &auto_vertical_output, (gptr*) &auto_vertical_output, 0, GET_BOOL,
NO_ARG, 0, 0, 0, 0, 0, 0},
+    (uchar**) &auto_vertical_output, (uchar**) &auto_vertical_output, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"batch", 'B',
    "Don't use history file. Disable interactive behavior. (Enables --silent)", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"character-sets-dir", OPT_CHARSETS_DIR,
diff -Nrup a/strings/ctype-uca.c b/strings/ctype-uca.c
--- a/strings/ctype-uca.c	2007-10-09 11:49:42 -04:00
+++ b/strings/ctype-uca.c	2007-10-09 15:30:46 -04:00
@@ -9462,40 +9462,6 @@ CHARSET_INFO my_charset_utf8_esperanto_u
     &my_collation_any_uca_handler
 };
 
-CHARSET_INFO my_charset_utf8_sinhala_uca_ci=
-{
-    211,0,0,		/* number       */
-    MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE,
-    "utf8",		/* cs name    */
-    "utf8_sinhala_ci",	/* name         */
-    "",			/* comment      */
-    sinhala,		/* tailoring    */
-    ctype_utf8,		/* ctype        */
-    NULL,		/* to_lower     */
-    NULL,		/* to_upper     */
-    NULL,		/* sort_order   */
-    NULL,		/* contractions */
-    NULL,		/* sort_order_big*/
-    NULL,		/* tab_to_uni   */
-    NULL,		/* tab_from_uni */
-    my_unicase_default, /* caseinfo     */
-    NULL,		/* state_map    */
-    NULL,		/* ident_map    */
-    8,			/* strxfrm_multiply */
-    1,                  /* caseup_multiply  */
-    1,                  /* casedn_multiply  */
-    3,			/* mbminlen     */
-    3,			/* mbmaxlen     */
-    9,			/* min_sort_char */
-    0xFFFF,		/* max_sort_char */
-    ' ',                /* pad char      */
-    0,                  /* escape_with_backslash_is_dangerous */
-    1,                  /* levels_for_compare */
-    1,                  /* levels_for_order   */
-    &my_charset_utf8_handler,
-    &my_collation_any_uca_handler
-};
-
 CHARSET_INFO my_charset_utf8_hungarian_uca_ci=
 {
     210,0,0,		/* number       */
@@ -9524,6 +9490,8 @@ CHARSET_INFO my_charset_utf8_hungarian_u
     0xFFFF,		/* max_sort_char */
     ' ',                /* pad char      */
     0,                  /* escape_with_backslash_is_dangerous */
+    1,                  /* levels_for_compare */
+    1,                  /* levels_for_order   */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };