Commit 5b2d1a65 authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin


ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmclient/main.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
parents 404b1524 6aebd056

include/m_ctype.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ typedef struct unicase_info_st 
#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_CHARSET_UNDEFINED 0

mysql-test/r/ctype_latin1.result

+9 −0
Original line number Diff line number Diff line
@@ -296,3 +296,12 @@ FD C3BD FD 1 
FE	C3BE	FE	1

FF	C3BF	FF	1

DROP TABLE t1;

select 'a' regexp 'A' collate latin1_general_ci;

'a' regexp 'A' collate latin1_general_ci

1

select 'a' regexp 'A' collate latin1_general_cs;

'a' regexp 'A' collate latin1_general_cs

0

select 'a' regexp 'A' collate latin1_bin;

'a' regexp 'A' collate latin1_bin

0

mysql-test/t/ctype_latin1.test

+7 −0
Original line number Diff line number Diff line
@@ -53,3 +53,10 @@ SELECT 
  hex(@l:=convert(@u using latin1)),

  a=@l FROM t1;

DROP TABLE t1;



#

# Bug #6737: REGEXP gives wrong result with case sensitive collation

#

select 'a' regexp 'A' collate latin1_general_ci;

select 'a' regexp 'A' collate latin1_general_cs;

select 'a' regexp 'A' collate latin1_bin;

mysys/charset.c

+11 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ static int add_collation(CHARSET_INFO *cs) 
      }

      else

      {

        uchar *sort_order= all_charsets[cs->number]->sort_order;

        simple_cs_init_functions(all_charsets[cs->number]);

        new->mbminlen= 1;

        new->mbmaxlen= 1;
@@ -236,6 +237,16 @@ static int add_collation(CHARSET_INFO *cs) 
          all_charsets[cs->number]->state |= MY_CS_LOADED;

        }

        all_charsets[cs->number]->state|= MY_CS_AVAILABLE;

        

        /*

          Check if case sensitive sort order: A < a < B.

          We need MY_CS_FLAG for regex library, and for

          case sensitivity flag for 5.0 client protocol,

          to support isCaseSensitive() method in JDBC driver 

        */

        if (sort_order && sort_order['A'] < sort_order['a'] &&

                          sort_order['a'] < sort_order['B'])

          all_charsets[cs->number]->state|= MY_CS_CSSORT; 

      }

    }

    else

ndb/include/util/ndb_opts.h

+12 −6
Original line number Diff line number Diff line
@@ -32,10 +32,13 @@ 
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \

  { "version", 'V', "Output version information and exit.", 0, 0, 0, \

    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \

  { "connect-string", 'c', \

  { "ndb-connectstring", 'c', \

    "Set connect string for connecting to ndb_mgmd. " \

    "<constr>=\"host=<hostname:port>[;nodeid=<id>]\". " \

    "Overides specifying entries in NDB_CONNECTSTRING and config file", \

    "Syntax: \"[nodeid=<id>;][host=]<hostname>[:<port>]\". " \

    "Overides specifying entries in NDB_CONNECTSTRING and Ndb.cfg", \

    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0, \

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\

  { "connect-string", 'c', "same as --ndb-connectstring",\

    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0, \

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }

#else
@@ -46,10 +49,13 @@ 
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \

  { "version", 'V', "Output version information and exit.", 0, 0, 0, \

    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \

  { "connect-string", 'c', \

  { "ndb-connectstring", 'c', \

    "Set connect string for connecting to ndb_mgmd. " \

    "<constr>=\"host=<hostname:port>[;nodeid=<id>]\". " \

    "Overides specifying entries in NDB_CONNECTSTRING and config file", \

    "Syntax: \"[nodeid=<id>;][host=]<hostname>[:<port>]\". " \

    "Overides specifying entries in NDB_CONNECTSTRING and Ndb.cfg", \

    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0, \

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\

  { "connect-string", 'c', "same as --ndb-connectstring",\

    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0,\

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }

#endif