Commit b5ae1184 authored by unknown's avatar unknown
Browse files

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines


sql/sql_update.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
mysql-test/r/windows.result:
  Use remote.
mysql-test/t/windows.test:
  Use remote.
parents 76cdfbbd 4d7a6cf7

mysql-test/r/csv.result

+19 −0
Original line number Diff line number Diff line
@@ -5205,3 +5205,22 @@ select * from bug15205; 
val

drop table bug15205;

drop table bug15205_2;

create table bug22080_1 (id int,string varchar(64)) Engine=CSV;

create table bug22080_2 (id int,string varchar(64)) Engine=CSV;

create table bug22080_3 (id int,string varchar(64)) Engine=CSV;

insert into bug22080_1 values(1,'string');

insert into bug22080_1 values(2,'string');

insert into bug22080_1 values(3,'string');

"1","string"

2","string"

"3","string"

check table bug22080_2;

Table	Op	Msg_type	Msg_text

test.bug22080_2	check	error	Corrupt

"1","string"

"2",string"

"3","string"

check table bug22080_3;

Table	Op	Msg_type	Msg_text

test.bug22080_3	check	error	Corrupt

drop tables bug22080_1,bug22080_2,bug22080_3;

mysql-test/r/merge.result

+5 −5
Original line number Diff line number Diff line
@@ -178,12 +178,12 @@ t3 CREATE TABLE `t3` ( 
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`t2`)

create table t4 (a int not null, b char(10), key(a)) engine=MERGE UNION=(t1,t2);

select * from t4;

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

alter table t4 add column c int;

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

flush tables;

select * from t4;

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

create database mysqltest;

create table mysqltest.t6 (a int not null primary key auto_increment, message char(20));

create table t5 (a int not null, b char(20), key(a)) engine=MERGE UNION=(test.t1,mysqltest.t6);
@@ -780,11 +780,11 @@ DROP TABLE t1, t2; 
CREATE TABLE t1(a INT) ENGINE=MEMORY;

CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t1);

SELECT * FROM t2;

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

DROP TABLE t1, t2;

CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t3);

SELECT * FROM t2;

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

DROP TABLE t2;

create table t1 (b bit(1));

create table t2 (b bit(1));

mysql-test/t/csv.test

+23 −0
Original line number Diff line number Diff line
@@ -1582,3 +1582,26 @@ select * from bug15205_2; 
select * from bug15205;

drop table bug15205;

drop table bug15205_2;



#

# Bug#22080 "CHECK fails to identify some corruption"

#



create table bug22080_1 (id int,string varchar(64)) Engine=CSV;

create table bug22080_2 (id int,string varchar(64)) Engine=CSV;

create table bug22080_3 (id int,string varchar(64)) Engine=CSV;

insert into bug22080_1 values(1,'string');

insert into bug22080_1 values(2,'string');

insert into bug22080_1 values(3,'string');



# Currupt the file as described in the bug report

--exec sed -e 's/"2"/2"/' $MYSQLTEST_VARDIR/master-data/test/bug22080_1.CSV > $MYSQLTEST_VARDIR/master-data/test/bug22080_2.CSV

--exec sed -e 's/2","/2",/' $MYSQLTEST_VARDIR/master-data/test/bug22080_1.CSV > $MYSQLTEST_VARDIR/master-data/test/bug22080_3.CSV



--exec cat $MYSQLTEST_VARDIR/master-data/test/bug22080_2.CSV

check table bug22080_2;



--exec cat $MYSQLTEST_VARDIR/master-data/test/bug22080_3.CSV

check table bug22080_3;



drop tables bug22080_1,bug22080_2,bug22080_3;

sql/share/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -3791,7 +3791,7 @@ ER_WRONG_MRG_TABLE 
        cze "V-Bechny tabulky v MERGE tabulce nejsou definovny stejn"

        dan "Tabellerne i MERGE er ikke defineret ens"

        nla "Niet alle tabellen in de MERGE tabel hebben identieke gedefinities"

        eng "Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists"

        eng "Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist"

        est "Kik tabelid MERGE tabeli mratluses ei ole identsed"

        fre "Toutes les tables de la table de type MERGE n'ont pas la mme dfinition"

        ger "Nicht alle Tabellen in der MERGE-Tabelle sind gleich definiert"

sql/sql_update.cc

+6 −0
Original line number Diff line number Diff line
@@ -1217,6 +1217,8 @@ multi_update::initialize_tables(JOIN *join) 
    TMP_TABLE_PARAM *tmp_param;



    table->mark_columns_needed_for_update();

    if (ignore)

      table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

    if (table == main_table)			// First table in join

    {

      if (safe_update_on_fly(join->join_tab))
@@ -1331,7 +1333,11 @@ multi_update::~multi_update() 
{

  TABLE_LIST *table;

  for (table= update_tables ; table; table= table->next_local)

  {

    table->table->no_keyread= table->table->no_cache= 0;

    if (ignore)

      table->table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);

  }



  if (tmp_tables)

  {