Commit f47c2328 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents fe8c67ef 905bc913

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>

mysql-test/r/ctype_uca.result

+9 −0
Original line number Diff line number Diff line
@@ -2654,3 +2654,12 @@ ii 2 ii 2 İİ 4 
İİ	4	ii	2	İİ	4

II	2	ıı	4	II	2

DROP TABLE t1;

CREATE TABLE t1 (

c1 text character set ucs2 collate ucs2_polish_ci NOT NULL

) ENGINE=MyISAM;

insert into t1 values (''),('a');

SELECT COUNT(*), c1 FROM t1 GROUP BY c1;

COUNT(*)	c1

1	

1	a

DROP TABLE IF EXISTS t1;