Commit 1f89605e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/my/mysql-5.0 

into  mysql.com:/home/my/mysql-5.1


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
  Use original file (my_user.c was already added in 5.1)
mysql-test/mysql-test-run.pl:
  Manual merge
sql/handler.h:
  Manual merge
sql/share/errmsg.txt:
  Align error messages with 5.0
sql/sql_table.cc:
  Manual merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
  No changes
parents 79d87430 63791773

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -364,6 +364,10 @@ SOURCE=..\sql-common\my_time.c 
# End Source File

# Begin Source File

 

SOURCE=..\sql-common\my_user.c

# End Source File

# Begin Source File



SOURCE=..\sql\net_serv.cpp

# End Source File

# Begin Source File

VC++Files/libmysqld/libmysqld_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -338,6 +338,10 @@ SOURCE="..\sql-common\my_time.c" 
# End Source File

# Begin Source File



SOURCE="..\sql-common\my_user.c"

# End Source File

# Begin Source File



SOURCE=..\sql\net_serv.cpp

# End Source File

# Begin Source File

include/my_tree.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ TREE_ELEMENT *tree_insert(TREE *tree,void *key, uint key_size, 
void *tree_search(TREE *tree, void *key, void *custom_arg);

int tree_walk(TREE *tree,tree_walk_action action,

	      void *argument, TREE_WALK visit);

int tree_delete(TREE *tree, void *key, void *custom_arg);

int tree_delete(TREE *tree, void *key, uint key_size, void *custom_arg);

void *tree_search_key(TREE *tree, const void *key, 

                      TREE_ELEMENT **parents, TREE_ELEMENT ***last_pos,

                      enum ha_rkey_function flag, void *custom_arg);

mysql-test/r/analyze.result

+8 −0
Original line number Diff line number Diff line
@@ -46,4 +46,12 @@ Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_ 
execute stmt1;

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

deallocate prepare stmt1;

create temporary table t1(a int, index(a));

insert into t1 values('1'),('2'),('3'),('4'),('5');

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

show index from t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE	

drop table t1;

mysql-test/r/heap_btree.result

+10 −0
Original line number Diff line number Diff line
@@ -246,3 +246,13 @@ DELETE from t1 where a < 100; 
SELECT * from t1;

a

DROP TABLE t1;

CREATE TABLE t1(val INT, KEY USING BTREE(val)) ENGINE=memory;

INSERT INTO t1 VALUES(0);

SELECT INDEX_LENGTH FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='t1';

INDEX_LENGTH

21

UPDATE t1 SET val=1;

SELECT INDEX_LENGTH FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='t1';

INDEX_LENGTH

21

DROP TABLE t1;