Commit aa0e7860 authored by unknown's avatar unknown
Browse files

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
parents f05d7cf7 9236e3c2

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ 
			errmsg.h my_global.h my_net.h my_alloc.h \

			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \

			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

			mysql_time.h plugin.h $(BUILT_SOURCES)

			mysql_time.h mysql/plugin.h $(BUILT_SOURCES)

noinst_HEADERS =	config-win.h config-os2.h config-netware.h \

			heap.h my_bitmap.h my_uctype.h \

			myisam.h myisampack.h myisammrg.h ft_global.h\

include/myisam.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ extern "C" { 
#include "keycache.h"

#endif

#include "my_handler.h"

#include <plugin.h>

#include <mysql/plugin.h>



/*

  There is a hard limit for the maximum number of keys as there are only

include/plugin.h→include/mysql/plugin.h

+0 −0

File moved.

View file

mysql-test/r/binlog_stm_binlog.result

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ insert into t1 values (1,2); 
commit;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	4	Format_desc	1	102	Server ver: 5.1.7-beta-debug-log, Binlog ver: 4

master-bin.000001	4	Format_desc	1	102	Server ver: #, Binlog ver: #

master-bin.000001	102	Query	1	209	use `test`; create table t1 (a int, b int) engine=innodb

master-bin.000001	209	Query	1	277	use `test`; BEGIN

master-bin.000001	277	Query	1	90	use `test`; insert into t1 values (1,2)

mysql-test/r/variables.result

+18 −0
Original line number Diff line number Diff line
@@ -566,3 +566,21 @@ set global character_set_system = latin1; 
ERROR HY000: Variable 'character_set_system' is a read only variable

set @@global.version_compile_os='234';

ERROR HY000: Variable 'version_compile_os' is a read only variable

set character_set_filesystem=latin1;

select @@character_set_filesystem;

@@character_set_filesystem

latin1

set @@global.character_set_filesystem=latin2;

set character_set_filesystem=latin1;

select @@character_set_filesystem;

@@character_set_filesystem

latin1

set @@global.character_set_filesystem=latin2;

set character_set_filesystem=default;

select @@character_set_filesystem;

@@character_set_filesystem

latin2

set @@global.character_set_filesystem=default;

select @@global.character_set_filesystem;

@@global.character_set_filesystem

binary