Commit d8098e9f authored by unknown's avatar unknown
Browse files

Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
parents f017b497 f32014a9

myisam/sort.c

+5 −7
Original line number Diff line number Diff line
@@ -483,13 +483,6 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) 
    if (!got_error)

    {

      mi_set_key_active(share->state.key_map, sinfo->key);

      if (param->testflag & T_STATISTICS)

        update_key_parts(sinfo->keyinfo, rec_per_key_part, sinfo->unique,

                         param->stats_method == MI_STATS_METHOD_IGNORE_NULLS?

                         sinfo->notnull: NULL,

                         (ulonglong) info->state->records);





      if (!sinfo->buffpek.elements)

      {

        if (param->testflag & T_VERBOSE)
@@ -501,6 +494,11 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) 
            flush_ft_buf(sinfo) || flush_pending_blocks(sinfo))

          got_error=1;

      }

      if (!got_error && param->testflag & T_STATISTICS)

        update_key_parts(sinfo->keyinfo, rec_per_key_part, sinfo->unique,

                         param->stats_method == MI_STATS_METHOD_IGNORE_NULLS?

                         sinfo->notnull: NULL,

                         (ulonglong) info->state->records);

    }

    my_free((gptr) sinfo->sort_keys,MYF(0));

    my_free(mi_get_rec_buff_ptr(info, sinfo->rec_buff),

mysql-test/r/mysqldump.result

+2 −2
Original line number Diff line number Diff line
@@ -2876,7 +2876,7 @@ drop view v1; 
drop table t1;

drop database mysqldump_dbb;

use test;

create user mysqltest_1;

create user mysqltest_1@localhost;

create table t1(a int, b varchar(34));

reset master;

mysqldump: Couldn't execute 'FLUSH TABLES': Access denied; you need the RELOAD privilege for this operation (1227)
@@ -2891,4 +2891,4 @@ CREATE TABLE `t1` ( 
  `b` varchar(34) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

drop table t1;

drop user mysqltest_1;
 
drop user mysqltest_1@localhost;

mysql-test/r/repair.result

+11 −0
Original line number Diff line number Diff line
@@ -41,3 +41,14 @@ Table Op Msg_type Msg_text 
test.t1	repair	warning	Number of rows changed from 0 to 1

test.t1	repair	status	OK

drop table t1;

CREATE TABLE t1(a INT, KEY(a));

INSERT INTO t1 VALUES(1),(2),(3),(4),(5);

SET myisam_repair_threads=2;

REPAIR TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	repair	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	

SET myisam_repair_threads=@@global.myisam_repair_threads;

DROP TABLE t1;

mysql-test/t/mysqldump.test

+2 −2
Original line number Diff line number Diff line
@@ -1273,7 +1273,7 @@ drop database mysqldump_dbb; 
use test;



# Create user without sufficient privs to perform the requested operation

create user mysqltest_1;

create user mysqltest_1@localhost;

create table t1(a int, b varchar(34));



# To get consistent output, reset the master, starts over from first log
@@ -1308,4 +1308,4 @@ grant REPLICATION CLIENT on *.* to mysqltest_1@localhost; 


# Clean up

drop table t1;

drop user mysqltest_1;
 
drop user mysqltest_1@localhost;

mysql-test/t/repair.test

+11 −0
Original line number Diff line number Diff line
@@ -34,4 +34,15 @@ repair table t1; 
repair table t1 use_frm;

drop table t1;



#

# BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1

#

CREATE TABLE t1(a INT, KEY(a));

INSERT INTO t1 VALUES(1),(2),(3),(4),(5);

SET myisam_repair_threads=2;

REPAIR TABLE t1;

SHOW INDEX FROM t1;

SET myisam_repair_threads=@@global.myisam_repair_threads;

DROP TABLE t1;



# End of 4.1 tests