Commit 6370f622 authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 

into  mysql.com:/home/bar/mysql-5.0.b27079
parents 916245f9 dbc12e4a

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ path=`dirname $0` 
extra_flags="$pentium_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $max_configs"

extra_configs="$pentium_configs $debug_configs $max_configs --with-experimental-collations"



. "$path/FINISH.sh"

client/mysql.cc

+2 −1
Original line number Diff line number Diff line
@@ -2529,7 +2529,8 @@ print_table_data_xml(MYSQL_RES *result) 


  tee_fputs("<?xml version=\"1.0\"?>\n\n<resultset statement=\"", PAGER);

  xmlencode_print(glob_buffer.ptr(), (int)strlen(glob_buffer.ptr()));

  tee_fputs("\">", PAGER);

  tee_fputs("\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">",

            PAGER);



  fields = mysql_fetch_fields(result);

  while ((cur = mysql_fetch_row(result)))

config/ac-macros/character_sets.m4

+13 −0
Original line number Diff line number Diff line
@@ -429,3 +429,16 @@ then 
else

  AC_MSG_RESULT(no)

fi





# Shall we build experimental collations

AC_ARG_WITH(experimental-collations,

    [],

    [with_exp_coll=$withval],

    [with_exp_coll=no]

)



if test "$with_exp_coll" = "yes"

then

  AC_DEFINE([HAVE_UTF8_GENERAL_CS], [1], [certain Japanese customer])

fi

mysql-test/r/client_xml.result

+6 −6
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); 
<?xml version="1.0"?>



<resultset statement="select * from t1

">

" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

  <row>

	<field name="a&amp;b">1</field>

	<field name="a&lt;b">2</field>
@@ -34,7 +34,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); 
<?xml version="1.0"?>



<resultset statement="select count(*) from t1

">

" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

  <row>

	<field name="count(*)">1</field>

  </row>
@@ -42,7 +42,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); 
<?xml version="1.0"?>



<resultset statement="select 1 &lt; 2 from dual

">

" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

  <row>

	<field name="1 &lt; 2">1</field>

  </row>
@@ -50,7 +50,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); 
<?xml version="1.0"?>



<resultset statement="select 1 &gt; 2 from dual

">

" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

  <row>

	<field name="1 &gt; 2">0</field>

  </row>
@@ -58,7 +58,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); 
<?xml version="1.0"?>



<resultset statement="select 1 &amp; 3 from dual

">

" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

  <row>

	<field name="1 &amp; 3">1</field>

  </row>
@@ -66,7 +66,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); 
<?xml version="1.0"?>



<resultset statement="select null from dual

">

" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

  <row>

	<field name="NULL" xsi:nil="true" />

  </row>

strings/ctype-utf8.c

+6 −1
Original line number Diff line number Diff line
@@ -2764,6 +2764,7 @@ static int my_strnncoll_utf8_cs(CHARSET_INFO *cs, 
  const uchar *te=t+tlen;

  int save_diff = 0;

  int diff;

  MY_UNICASE_INFO **uni_plane= cs->caseinfo;



  while ( s < se && t < te )

  {
@@ -2800,13 +2801,16 @@ static int my_strnncoll_utf8_cs(CHARSET_INFO *cs, 


static int my_strnncollsp_utf8_cs(CHARSET_INFO *cs, 

                                  const uchar *s, uint slen,

                                  const uchar *t, uint tlen)

                                  const uchar *t, uint tlen,

                                  my_bool diff_if_only_endspace_difference

                                  __attribute__((unused)))

{

  int s_res,t_res;

  my_wc_t s_wc,t_wc;

  const uchar *se= s+slen;

  const uchar *te= t+tlen;

  int save_diff = 0;

  MY_UNICASE_INFO **uni_plane= cs->caseinfo;

  

  while ( s < se && t < te )

  {
@@ -2875,6 +2879,7 @@ static MY_COLLATION_HANDLER my_collation_cs_handler = 
    my_strnncoll_utf8_cs,

    my_strnncollsp_utf8_cs,

    my_strnxfrm_utf8,

    my_strnxfrmlen_utf8,

    my_like_range_simple,

    my_wildcmp_mb,

    my_strcasecmp_utf8,