Commit 8a4c0714 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/jonas/src/mysql-5.1-push


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged
parents eb9f8480 80437546

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# Don't forget to also update the NDB lines below.

AM_INIT_AUTOMAKE(mysql, 5.1.0-alpha)

AM_INIT_AUTOMAKE(mysql, 5.1.1-alpha)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=0

NDB_VERSION_BUILD=1

NDB_VERSION_STATUS="alpha"



# Set all version vars based on $VERSION. How do we do this more elegant ?

include/my_global.h

+0 −8
Original line number Diff line number Diff line
@@ -78,14 +78,6 @@ 
#endif

#endif /* _WIN32... */



/* Remove some things in embedded library */

#ifdef EMBEDDED_LIBRARY

/* No partition handler in embedded library */

#ifdef HAVE_PARTITION_DB

#undef HAVE_PARTITION_DB

#endif

#endif



/* Some defines to avoid ifdefs in the code */

#ifndef NETWARE_YIELD

#define NETWARE_YIELD

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	spatial.cc gstream.cc sql_help.cc tztime.cc protocol_cursor.cc \

	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \

	parse_file.cc rpl_filter.cc sql_view.cc sql_trigger.cc my_decimal.cc \

	ha_blackhole.cc

	ha_blackhole.cc sql_partition.cc ha_partition.cc



libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)

libmysqld_a_SOURCES=

mysql-test/r/ctype_latin1.result

+5 −5
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ hex(a) hex(@u:=convert(a using utf8)) hex(@l:=convert(@u using latin1)) a=@l 
7E	7E	7E	1

7F	7F	7F	1

80	E282AC	80	1

81	3F	3F	0

81	C281	81	1

82	E2809A	82	1

83	C692	83	1

84	E2809E	84	1
@@ -180,10 +180,10 @@ hex(a) hex(@u:=convert(a using utf8)) hex(@l:=convert(@u using latin1)) a=@l 
8A	C5A0	8A	1

8B	E280B9	8B	1

8C	C592	8C	1

8D	3F	3F	0

8D	C28D	8D	1

8E	C5BD	8E	1

8F	3F	3F	0

90	3F	3F	0

8F	C28F	8F	1

90	C290	90	1

91	E28098	91	1

92	E28099	92	1

93	E2809C	93	1
@@ -196,7 +196,7 @@ hex(a) hex(@u:=convert(a using utf8)) hex(@l:=convert(@u using latin1)) a=@l 
9A	C5A1	9A	1

9B	E280BA	9B	1

9C	C593	9C	1

9D	3F	3F	0

9D	C29D	9D	1

9E	C5BE	9E	1

9F	C5B8	9F	1

A0	C2A0	A0	1

mysql-test/r/information_schema.result

+4 −4
Original line number Diff line number Diff line
@@ -182,13 +182,13 @@ drop database mysqltest; 
select * from information_schema.CHARACTER_SETS

where CHARACTER_SET_NAME like 'latin1%';

CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN

latin1	latin1_swedish_ci	ISO 8859-1 West European	1

latin1	latin1_swedish_ci	cp1252 West European	1

SHOW CHARACTER SET LIKE 'latin1%';

Charset	Description	Default collation	Maxlen

latin1	ISO 8859-1 West European	latin1_swedish_ci	1

latin1	cp1252 West European	latin1_swedish_ci	1

SHOW CHARACTER SET WHERE charset like 'latin1%';

Charset	Description	Default collation	Maxlen

latin1	ISO 8859-1 West European	latin1_swedish_ci	1

latin1	cp1252 West European	latin1_swedish_ci	1

select * from information_schema.COLLATIONS

where COLLATION_NAME like 'latin1%';

COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
@@ -501,7 +501,7 @@ create table t1 select * from information_schema.CHARACTER_SETS 
where CHARACTER_SET_NAME like "latin1";

select * from t1;

CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN

latin1	latin1_swedish_ci	ISO 8859-1 West European	1

latin1	latin1_swedish_ci	cp1252 West European	1

alter table t1 default character set utf8;

show create table t1;

Table	Create Table