database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/bar/mysql-5.0.b27079
This commit is contained in:
bar@mysql.com
2007-03-29 10:19:45 +05:00
parent 1b426d3c6d 98a4bb356a
commit 6d290278cc
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/compile-pentium-debug-max
View File

@ -6,6 +6,6 @@ path=`dirname $0`
extra_flags="$pentium_cflags $debug_cflags $max_cflags" extra_flags="$pentium_cflags $debug_cflags $max_cflags"
c_warnings="$c_warnings $debug_extra_warnings" c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_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" . "$path/FINISH.sh"

3
client/mysql.cc
View File

@ -2529,7 +2529,8 @@ print_table_data_xml(MYSQL_RES *result)
tee_fputs("<?xml version=\"1.0\"?>\n\n<resultset statement=\"", PAGER); tee_fputs("<?xml version=\"1.0\"?>\n\n<resultset statement=\"", PAGER);
xmlencode_print(glob_buffer.ptr(), (int)strlen(glob_buffer.ptr())); 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); fields = mysql_fetch_fields(result);
while ((cur = mysql_fetch_row(result))) while ((cur = mysql_fetch_row(result)))

13
config/ac-macros/character_sets.m4
View File

@ -429,3 +429,16 @@ then
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi 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

12
mysql-test/r/client_xml.result
View File

@ -7,7 +7,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?> <?xml version="1.0"?>
<resultset statement="select * from t1 <resultset statement="select * from t1
"> " xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<row> <row>
<field name="a&amp;b">1</field> <field name="a&amp;b">1</field>
<field name="a&lt;b">2</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"?> <?xml version="1.0"?>
<resultset statement="select count(*) from t1 <resultset statement="select count(*) from t1
"> " xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<row> <row>
<field name="count(*)">1</field> <field name="count(*)">1</field>
</row> </row>
@ -42,7 +42,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?> <?xml version="1.0"?>
<resultset statement="select 1 &lt; 2 from dual <resultset statement="select 1 &lt; 2 from dual
"> " xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<row> <row>
<field name="1 &lt; 2">1</field> <field name="1 &lt; 2">1</field>
</row> </row>
@ -50,7 +50,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?> <?xml version="1.0"?>
<resultset statement="select 1 &gt; 2 from dual <resultset statement="select 1 &gt; 2 from dual
"> " xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<row> <row>
<field name="1 &gt; 2">0</field> <field name="1 &gt; 2">0</field>
</row> </row>
@ -58,7 +58,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?> <?xml version="1.0"?>
<resultset statement="select 1 &amp; 3 from dual <resultset statement="select 1 &amp; 3 from dual
"> " xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<row> <row>
<field name="1 &amp; 3">1</field> <field name="1 &amp; 3">1</field>
</row> </row>
@ -66,7 +66,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?> <?xml version="1.0"?>
<resultset statement="select null from dual <resultset statement="select null from dual
"> " xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<row> <row>
<field name="NULL" xsi:nil="true" /> <field name="NULL" xsi:nil="true" />
</row> </row>

7
strings/ctype-utf8.c
View File

@ -2764,6 +2764,7 @@ static int my_strnncoll_utf8_cs(CHARSET_INFO *cs,
const uchar *te=t+tlen; const uchar *te=t+tlen;
int save_diff = 0; int save_diff = 0;
int diff; int diff;
MY_UNICASE_INFO **uni_plane= cs->caseinfo;
while ( s < se && t < te ) 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, static int my_strnncollsp_utf8_cs(CHARSET_INFO *cs,
const uchar *s, uint slen, 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; int s_res,t_res;
my_wc_t s_wc,t_wc; my_wc_t s_wc,t_wc;
const uchar *se= s+slen; const uchar *se= s+slen;
const uchar *te= t+tlen; const uchar *te= t+tlen;
int save_diff = 0; int save_diff = 0;
MY_UNICASE_INFO **uni_plane= cs->caseinfo;
while ( s < se && t < te ) while ( s < se && t < te )
{ {
@ -2875,6 +2879,7 @@ static MY_COLLATION_HANDLER my_collation_cs_handler =
my_strnncoll_utf8_cs, my_strnncoll_utf8_cs,
my_strnncollsp_utf8_cs, my_strnncollsp_utf8_cs,
my_strnxfrm_utf8, my_strnxfrm_utf8,
my_strnxfrmlen_utf8,
my_like_range_simple, my_like_range_simple,
my_wildcmp_mb, my_wildcmp_mb,
my_strcasecmp_utf8, my_strcasecmp_utf8,