Commit 4566c09d 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/mysql_priv.h:
  Auto merged
parents d2667d1a 2e302abc

client/mysql.cc

+11 −0
Original line number Diff line number Diff line
@@ -2117,6 +2117,17 @@ com_go(String *buffer,char *line __attribute__((unused))) 
      if (!mysql_num_rows(result) && ! quick && !info_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/bdb_notembedded.result

0 → 100644
+35 −0
Original line number Diff line number Diff line 
set autocommit=1;

reset master;

create table bug16206 (a int);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4

f	n	Query	1	n	use `test`; create table bug16206 (a int)

f	n	Query	1	n	use `test`; insert into bug16206 values(1)

f	n	Query	1	n	use `test`; insert into bug16206 values(2)

drop table bug16206;

reset master;

create table bug16206 (a int) engine=         bdb;

insert into bug16206 values(0);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

insert into bug16206 values(3);

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4

f	n	Query	1	n	use `test`; create table bug16206 (a int) engine=         bdb

f	n	Query	1	n	use `test`; insert into bug16206 values(0)

f	n	Query	1	n	use `test`; insert into bug16206 values(1)

f	n	Query	1	n	use `test`; BEGIN

f	n	Query	1	n	use `test`; insert into bug16206 values(2)

f	n	Query	1	n	use `test`; COMMIT

f	n	Query	1	n	use `test`; insert into bug16206 values(3)

drop table bug16206;

set autocommit=0;

End of 5.0 tests

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
@@ -637,6 +637,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/bdb_notembedded.test

0 → 100644
+38 −0
Original line number Diff line number Diff line 
-- source include/not_embedded.inc

-- source include/have_bdb.inc



#

# Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit mode

#

set autocommit=1;



let $VERSION=`select version()`;



reset master;

create table bug16206 (a int);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

--replace_result $VERSION VERSION

--replace_column 1 f 2 n 5 n

show binlog events;

drop table bug16206;



reset master;

create table bug16206 (a int) engine=         bdb;

insert into bug16206 values(0);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

insert into bug16206 values(3);

--replace_result $VERSION VERSION

--replace_column 1 f 2 n 5 n

show binlog events;

drop table bug16206;



set autocommit=0;





--echo End of 5.0 tests