Commit cb754eb5 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fix after merge

parent c298f035

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -446,3 +446,4 @@ vio/test-sslclient 
vio/test-sslserver

vio/viotest-ssl

sql-bench/test-transactions

libmysqld/sql_do.cc

include/m_string.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ extern int bcmp(const char *s1,const char *s2,uint len); 
#endif

#ifdef HAVE_purify

extern	int my_bcmp(const char *s1,const char *s2,uint len);

#undef bcmp

#define bcmp(A,B,C) my_bcmp((A),(B),(C))

#endif

libmysql/Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ target_sources = libmysql.c net.c password.c manager.c \ 
mystringsobjects =	strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo \

			strnlen.lo strfill.lo is_prefix.lo \

			int2str.lo str2int.lo strinstr.lo strcont.lo \

			strcend.lo \

			strcend.lo bcmp.lo \

			bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \

			strtoull.lo strtoll.lo llstr.lo \

			ctype.lo $(LTCHARSET_OBJS)

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ 
	sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \

	sql_crypt.cc sql_db.cc sql_delete.cc sql_insert.cc sql_lex.cc \

	sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \

	sql_rename.cc sql_repl.cc sql_select.cc sql_show.cc \

	sql_rename.cc sql_repl.cc sql_select.cc sql_do.cc sql_show.cc \

	sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \

	sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \

	unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc

mysql-test/r/innodb.result

+7 −7
Original line number Diff line number Diff line
@@ -140,13 +140,13 @@ id parent_id level 
1015	102	2

explain select level from t1 where level=1;

table	type	possible_keys	key	key_len	ref	rows	Extra

t1	index	level	level	1	NULL	39	where used; Using index

t1	ref	level	level	1	const	12	where used; Using index

explain select level,id from t1 where level=1;

table	type	possible_keys	key	key_len	ref	rows	Extra

t1	index	level	level	1	NULL	39	where used; Using index

t1	ref	level	level	1	const	12	where used; Using index

explain select level,id,parent_id from t1 where level=1;

table	type	possible_keys	key	key_len	ref	rows	Extra

t1	ALL	level	NULL	NULL	NULL	39	where used

t1	ref	level	level	1	const	12	where used

select level,id from t1 where level=1;

level	id

1	1002
@@ -168,9 +168,9 @@ Table Op Msg_type Msg_text 
test.t1	optimize	error	The handler for the table doesn't support check/repair

show keys from t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Comment

t1	0	PRIMARY	1	id	A	2	NULL	NULL	

t1	1	parent_id	1	parent_id	A	2	NULL	NULL	

t1	1	level	1	level	A	2	NULL	NULL	

t1	0	PRIMARY	1	id	A	87	NULL	NULL	

t1	1	parent_id	1	parent_id	A	21	NULL	NULL	

t1	1	level	1	level	A	4	NULL	NULL	

drop table t1;

CREATE TABLE t1 (

gesuchnr int(11) DEFAULT '0' NOT NULL,
@@ -727,7 +727,7 @@ Table Op Msg_type Msg_text 
test.t1	optimize	error	The handler for the table doesn't support check/repair

show keys from t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Comment

t1	0	PRIMARY	1	a	A	2	NULL	NULL	

t1	0	PRIMARY	1	a	A	1	NULL	NULL	

drop table t1;

create table t1 (i int, j int ) TYPE=innodb;

insert into t1 values (1,2);