Commit e60eba18 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new-maint 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
parents c5adcd20 22ce97e3

client/mysqldump.c

+1 −0
Original line number Diff line number Diff line
@@ -865,6 +865,7 @@ static void DB_error(MYSQL *mysql, const char *when) 
  DBUG_ENTER("DB_error");

  fprintf(stderr, "%s: Got error: %d: %s %s\n", my_progname,

          mysql_errno(mysql), mysql_error(mysql), when);

  fflush(stderr);

  safe_exit(EX_MYSQLERR);

  DBUG_VOID_RETURN;

} /* DB_error */

mysql-test/r/windows.result

+28 −0
Original line number Diff line number Diff line
@@ -6,3 +6,31 @@ use prn; 
ERROR 42000: Unknown database 'prn'

create table nu (a int);

drop table nu;

CREATE TABLE `t1` (

`TIM` datetime NOT NULL,

`VAL` double default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

CREATE TABLE `t2` (

`TIM` datetime NOT NULL,

`VAL` double default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

CREATE TABLE `mt` (

`TIM` datetime NOT NULL,

`VAL` double default NULL

) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST

UNION=(`t1`,`t2`);

INSERT INTO mt VALUES ('2006-01-01',0);

ALTER TABLE `t2` RENAME TO `t`;

INSERT INTO mt VALUES ('2006-01-01',0);

ERROR HY000: Can't lock file (errno: 155)

select * from mt;

ERROR HY000: Can't lock file (errno: 155)

FLUSH TABLES;

select * from mt;

ERROR HY000: Can't find file: 'mt' (errno: 2)

ALTER TABLE `t` RENAME TO `t2`;

INSERT INTO mt VALUES ('2006-01-01',0);

select * from mt;

TIM	VAL

2006-01-01 00:00:00	0

2006-01-01 00:00:00	0

mysql-test/t/windows.test

+39 −0
Original line number Diff line number Diff line
@@ -18,3 +18,42 @@ create table nu (a int); 
drop table nu;



# End of 4.1 tests



#

# Bug #20789: Merge Subtable Rename Causes Crash

#

CREATE TABLE `t1` (

  `TIM` datetime NOT NULL,

  `VAL` double default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

CREATE TABLE `t2` (

  `TIM` datetime NOT NULL,

  `VAL` double default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

CREATE TABLE `mt` (

  `TIM` datetime NOT NULL,

  `VAL` double default NULL

) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST

UNION=(`t1`,`t2`);



# insert into the merge table and thus open it.

INSERT INTO mt VALUES ('2006-01-01',0);



# Alter one of the tables that are part of the merge table

ALTER TABLE `t2` RENAME TO `t`;



# Insert into the merge table that has just been altered

--error 1015

INSERT INTO mt VALUES ('2006-01-01',0); 

--error 1015

select * from mt;



FLUSH TABLES;

--error 1017

select * from mt;



# Alter one of the tables that are part of the merge table

ALTER TABLE `t` RENAME TO `t2`;

INSERT INTO mt VALUES ('2006-01-01',0);

select * from mt;

storage/myisam/mi_locking.c

+11 −0
Original line number Diff line number Diff line
@@ -237,6 +237,17 @@ int mi_lock_database(MI_INFO *info, int lock_type) 
      break;				/* Impossible */

    }

  } 

#ifdef __WIN__

  else

  {

    /*

      The file has been closed and kfile is -1.

      See mi_extra.c about implementation of

      HA_EXTRA_PREPARE_FOR_DELETE.

    */

    error=HA_ERR_NO_SUCH_TABLE;

  }

#endif

  pthread_mutex_unlock(&share->intern_lock);

#if defined(FULL_LOG) || defined(_lint)

  lock_type|=(int) (flag << 8);		/* Set bit to set if real lock */