database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines

Browse Source 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


mysql-test/r/repair.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisammrg/myrg_open.c:
  Auto merged
mysql-test/r/merge.result:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.
This commit is contained in:
unknown
2006-09-27 18:58:23 +05:00
parent ffa4a1e05a d6d1176eed
commit d119810cca
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/r/merge.result
View File

@ -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: All tables in the MERGE table are not identically defined
ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists
alter table t4 add column c int;
ERROR HY000: All tables in the MERGE table are not identically defined
ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists
flush tables;
select * from t4;
ERROR HY000: All tables in the MERGE table are not identically defined
ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists
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);
@ -771,6 +771,15 @@ Table Op Msg_type Msg_text
test.t1 check status OK
test.t2 check status OK
drop table t1, t2, t3;
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
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
DROP TABLE t2;
create table t1 (b bit(1));
create table t2 (b bit(1));
create table tm (b bit(1)) engine = merge union = (t1,t2);

14
mysql-test/t/merge.test
View File

@ -381,6 +381,20 @@ select * from t3;
check table t1, t2;
drop table t1, t2, t3;
#
# BUG#10974 - No error message if merge table based on union of innodb,
# memory
#
CREATE TABLE t1(a INT) ENGINE=MEMORY;
CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t1);
--error 1168
SELECT * FROM t2;
DROP TABLE t1, t2;
CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t3);
--error 1168
SELECT * FROM t2;
DROP TABLE t2;
# End of 4.1 tests
#

2
sql/share/errmsg.txt
View File

@ -3791,7 +3791,7 @@ ER_WRONG_MRG_TABLE
cze "V-B<>echny tabulky v MERGE tabulce nejsou definov<6F>ny stejn<6A>"
dan "Tabellerne i MERGE er ikke defineret ens"
nla "Niet alle tabellen in de MERGE tabel hebben identieke gedefinities"
eng "All tables in the MERGE table are not identically defined"
eng "Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists"
est "K<>ik tabelid MERGE tabeli m<><6D>ratluses ei ole identsed"
fre "Toutes les tables de la table de type MERGE n'ont pas la m<>me d<>finition"
ger "Nicht alle Tabellen in der MERGE-Tabelle sind gleich definiert"

3
storage/myisammrg/myrg_open.c
View File

@ -90,7 +90,10 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking)
else
fn_format(buff, buff, "", "", 0);
if (!(isam=mi_open(buff,mode,(handle_locking?HA_OPEN_WAIT_IF_LOCKED:0))))
{
my_errno= HA_ERR_WRONG_MRG_TABLE_DEF;
goto err;
}
if (!m_info) /* First file */
{
key_parts=isam->s->base.key_parts;