Commit 6d9d64ba authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bar/mysql-5.0-rpl 

into  mysql.com:/home/bar/mysql-5.1-new-rpl


client/mysql.cc:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged
parents ec9b5eca 2e302abc

client/mysql.cc

+11 −0
Original line number Diff line number Diff line
@@ -2104,6 +2104,17 @@ com_go(String *buffer,char *line __attribute__((unused))) 
      if (!mysql_num_rows(result) && ! quick && !column_types_flag)

      {

	strmov(buff, "Empty set");

        if (opt_xml)

        { 

          /*

            We must print XML header and footer

            to produce a well-formed XML even if

            the result set is empty (Bug#27608).

          */

          init_pager();

          print_table_data_xml(result);

          end_pager();

        }

      }

      else

      {

mysql-test/r/client_xml.result

+14 −0
Original line number Diff line number Diff line
@@ -71,4 +71,18 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); 
	<field name="NULL" xsi:nil="true" />

  </row>

</resultset>

<?xml version="1.0"?>



<resultset statement="select 1 limit 0

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

--------------

select 1 limit 0

--------------



<?xml version="1.0"?>



<resultset statement="select 1 limit 0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"></resultset>

Empty set



Bye

drop table t1;

mysql-test/r/variables.result

+31 −0
Original line number Diff line number Diff line
@@ -753,6 +753,37 @@ set lc_time_names=0; 
select @@lc_time_names;

@@lc_time_names

en_US

select @@global.lc_time_names, @@lc_time_names;

@@global.lc_time_names	@@lc_time_names

en_US	en_US

set @@global.lc_time_names=fr_FR;

select @@global.lc_time_names, @@lc_time_names;

@@global.lc_time_names	@@lc_time_names

fr_FR	en_US

New connection

select @@global.lc_time_names, @@lc_time_names;

@@global.lc_time_names	@@lc_time_names

fr_FR	fr_FR

set @@lc_time_names=ru_RU;

select @@global.lc_time_names, @@lc_time_names;

@@global.lc_time_names	@@lc_time_names

fr_FR	ru_RU

Returnung to default connection

select @@global.lc_time_names, @@lc_time_names;

@@global.lc_time_names	@@lc_time_names

fr_FR	en_US

set lc_time_names=default;

select @@global.lc_time_names, @@lc_time_names;

@@global.lc_time_names	@@lc_time_names

fr_FR	fr_FR

set @@global.lc_time_names=default;

select @@global.lc_time_names, @@lc_time_names;

@@global.lc_time_names	@@lc_time_names

en_US	fr_FR

set @@lc_time_names=default;

select @@global.lc_time_names, @@lc_time_names;

@@global.lc_time_names	@@lc_time_names

en_US	en_US

set @test = @@query_prealloc_size;

set @@query_prealloc_size = @test;

select @@query_prealloc_size = @test;

mysql-test/t/client_xml.test

+2 −0
Original line number Diff line number Diff line
@@ -17,5 +17,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); 
--exec $MYSQL --xml test -e "select 1 > 2 from dual"

--exec $MYSQL --xml test -e "select 1 & 3 from dual"

--exec $MYSQL --xml test -e "select null from dual"

--exec $MYSQL --xml test -e "select 1 limit 0"

--exec $MYSQL --xml test -vv -e "select 1 limit 0"



drop table t1;

mysql-test/t/variables.test

+24 −0
Original line number Diff line number Diff line
@@ -539,6 +539,30 @@ select @@lc_time_names; 
set lc_time_names=0;

select @@lc_time_names;



#

# Bug #22648 LC_TIME_NAMES: Setting GLOBAL has no effect

#

select @@global.lc_time_names, @@lc_time_names;

set @@global.lc_time_names=fr_FR;

select @@global.lc_time_names, @@lc_time_names;

--echo New connection

connect (con1,localhost,root,,);

connection con1;

select @@global.lc_time_names, @@lc_time_names;

set @@lc_time_names=ru_RU;

select @@global.lc_time_names, @@lc_time_names;

disconnect con1;

connection default;

--echo Returnung to default connection

select @@global.lc_time_names, @@lc_time_names;

set lc_time_names=default;

select @@global.lc_time_names, @@lc_time_names;

set @@global.lc_time_names=default;

select @@global.lc_time_names, @@lc_time_names;

set @@lc_time_names=default;

select @@global.lc_time_names, @@lc_time_names;





#

# Bug #13334: query_prealloc_size default less than minimum

#