Commit ac941700 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  hundin.mysql.fi:/home/jani/mysql-4.1


sql/sql_show.cc:
  Auto merged
parents 29a3343e 66d4b40c

innobase/include/dict0dict.ic

+0 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ dict_table_get_n_user_cols( 
{

	ut_ad(table);

	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);

	ut_ad(table->cached);

	

	return(table->n_cols - DATA_N_SYS_COLS);

}
@@ -127,7 +126,6 @@ dict_table_get_n_cols( 
{

	ut_ad(table);

	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);

	ut_ad(table->cached);

	

	return(table->n_cols);

}

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/r/auto_increment.result

+24 −0
Original line number Diff line number Diff line
@@ -355,3 +355,27 @@ CHECK TABLE t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE IF EXISTS t1;

CREATE TABLE `t1` (

t1_name VARCHAR(255) DEFAULT NULL,

t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,

KEY (t1_name),

PRIMARY KEY (t1_id)

) AUTO_INCREMENT = 1000;

INSERT INTO t1 (t1_name) VALUES('MySQL');

INSERT INTO t1 (t1_name) VALUES('MySQL');

INSERT INTO t1 (t1_name) VALUES('MySQL');

SELECT * from t1;

t1_name	t1_id

MySQL	1000

MySQL	1001

MySQL	1002

SHOW CREATE TABLE `t1`;

Table	Create Table

t1	CREATE TABLE `t1` (

  `t1_name` varchar(255) default NULL,

  `t1_id` int(10) unsigned NOT NULL auto_increment,

  PRIMARY KEY  (`t1_id`),

  KEY `t1_name` (`t1_name`)

) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1

DROP TABLE `t1`;

End of 4.1 tests