1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

switched to new syntax (TYPE->ENGINE)

Browse Source 
check of memory allocation operation was added


mysql-test/r/subselect_innodb.result:
  switched to new syntax
mysql-test/t/subselect_innodb.test:
  switched to new syntax
sql/sql_select.cc:
  check of memory allocation operation
This commit is contained in:
unknown 2004-01-17 13:00:46 +02:00
parent dea4107141
commit 2de832dbf9
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/subselect_innodb.result
View File

@ -69,7 +69,7 @@ b int(11) default NULL,
c char(3) default NULL, c char(3) default NULL,
PRIMARY KEY (id), PRIMARY KEY (id),
KEY t2i1 (b) KEY t2i1 (b)
) TYPE=innodb DEFAULT CHARSET=latin1; ) ENGINE=innodb DEFAULT CHARSET=latin1;
INSERT INTO t1 VALUES (0,0,'GPL'),(1,0,'GPL'),(2,1,'GPL'),(3,2,'GPL'); INSERT INTO t1 VALUES (0,0,'GPL'),(1,0,'GPL'),(2,1,'GPL'),(3,2,'GPL');
CREATE TABLE t2 ( CREATE TABLE t2 (
id int(11) NOT NULL default '0', id int(11) NOT NULL default '0',
@ -77,7 +77,7 @@ b int(11) default NULL,
c char(3) default NULL, c char(3) default NULL,
PRIMARY KEY (id), PRIMARY KEY (id),
KEY t2i (b) KEY t2i (b)
) TYPE=innodb DEFAULT CHARSET=latin1; ) ENGINE=innodb DEFAULT CHARSET=latin1;
INSERT INTO t2 VALUES (0,0,'GPL'),(1,0,'GPL'),(2,1,'GPL'),(3,2,'GPL'); INSERT INTO t2 VALUES (0,0,'GPL'),(1,0,'GPL'),(2,1,'GPL'),(3,2,'GPL');
select (select max(id) from t2 where b=1 group by b) as x,b from t1 where b=1; select (select max(id) from t2 where b=1 group by b) as x,b from t1 where b=1;
x b x b

4
mysql-test/t/subselect_innodb.test
View File

@ -78,7 +78,7 @@ CREATE TABLE t1 (
c char(3) default NULL, c char(3) default NULL,
PRIMARY KEY (id), PRIMARY KEY (id),
KEY t2i1 (b) KEY t2i1 (b)
) TYPE=innodb DEFAULT CHARSET=latin1; ) ENGINE=innodb DEFAULT CHARSET=latin1;
INSERT INTO t1 VALUES (0,0,'GPL'),(1,0,'GPL'),(2,1,'GPL'),(3,2,'GPL'); INSERT INTO t1 VALUES (0,0,'GPL'),(1,0,'GPL'),(2,1,'GPL'),(3,2,'GPL');
CREATE TABLE t2 ( CREATE TABLE t2 (
id int(11) NOT NULL default '0', id int(11) NOT NULL default '0',
@ -86,7 +86,7 @@ CREATE TABLE t2 (
c char(3) default NULL, c char(3) default NULL,
PRIMARY KEY (id), PRIMARY KEY (id),
KEY t2i (b) KEY t2i (b)
) TYPE=innodb DEFAULT CHARSET=latin1; ) ENGINE=innodb DEFAULT CHARSET=latin1;
INSERT INTO t2 VALUES (0,0,'GPL'),(1,0,'GPL'),(2,1,'GPL'),(3,2,'GPL'); INSERT INTO t2 VALUES (0,0,'GPL'),(1,0,'GPL'),(2,1,'GPL'),(3,2,'GPL');
select (select max(id) from t2 where b=1 group by b) as x,b from t1 where b=1; select (select max(id) from t2 where b=1 group by b) as x,b from t1 where b=1;
drop table t1,t2; drop table t1,t2;

3
sql/sql_select.cc
View File

@ -1586,7 +1586,8 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
} }
else else
{ {
join= new JOIN(thd, fields, select_options, result); if (!(join= new JOIN(thd, fields, select_options, result)))
DBUG_RETURN(-1);
thd->proc_info="init"; thd->proc_info="init";
thd->used_tables=0; // Updated by setup_fields thd->used_tables=0; // Updated by setup_fields
if (join->prepare(rref_pointer_array, tables, wild_num, if (join->prepare(rref_pointer_array, tables, wild_num,