Commit 050a9f3f authored by unknown's avatar unknown
Browse files

Merge hf@192.168.21.28:work/mysql-4.1.16892 

into mysql.com:/home/hf/work/mysql-4.1.mrg
parents 651c0c18 f4c6c0ed

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ sub command_line_setup () { 
    $glob_use_embedded_server= 1;

    push(@glob_test_mode, "embedded");

    $opt_skip_rpl= 1;              # We never run replication with embedded

    $opt_skip_ndbcluster= 1;



    if ( $opt_extern )

    {

mysql-test/mysql-test-run.sh

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ while test $# -gt 0; do 
      USE_EMBEDDED_SERVER=1

      USE_MANAGER=0 NO_SLAVE=1

      USE_RUNNING_SERVER=""

      USE_NDBCLUSTER=""

      TEST_MODE="$TEST_MODE embedded" ;;

    --purify)

      USE_PURIFY=1

mysql-test/r/analyze.result

+9 −0
Original line number Diff line number Diff line
@@ -37,3 +37,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/t/analyze.test

+9 −0
Original line number Diff line number Diff line
@@ -48,4 +48,13 @@ execute stmt1; 
execute stmt1;

deallocate prepare stmt1;



#

# bug#15225 (ANALYZE temporary has no effect)

#

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

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

analyze table t1;

show index from t1;

drop table t1;



# End of 4.1 tests

mysql-test/t/mysqltest.test

+1 −0
Original line number Diff line number Diff line 
-- source include/not_embedded.inc



# ============================================================================

#