diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-01-17 13:00:46 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-01-17 13:00:46 +0200 |
| commit | 2de832dbf99a8796b081419a29cacbeb07cd3871 (patch) | |
| tree | 89dba87bbf8d55bffb9d2843c235f27e310a5ff8 | |
| parent | dea4107141f986aaacb73f348ef48d989a501ca6 (diff) | |
| download | mariadb-git-2de832dbf99a8796b081419a29cacbeb07cd3871.tar.gz | |
switched to new syntax (TYPE->ENGINE)
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
| -rw-r--r-- | mysql-test/r/subselect_innodb.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/subselect_innodb.test | 4 | ||||
| -rw-r--r-- | sql/sql_select.cc | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/r/subselect_innodb.result b/mysql-test/r/subselect_innodb.result index 3a2a36475c5..e3528e06546 100644 --- a/mysql-test/r/subselect_innodb.result +++ b/mysql-test/r/subselect_innodb.result @@ -69,7 +69,7 @@ b int(11) default NULL, c char(3) default NULL, PRIMARY KEY (id), 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'); CREATE TABLE t2 ( id int(11) NOT NULL default '0', @@ -77,7 +77,7 @@ b int(11) default NULL, c char(3) default NULL, PRIMARY KEY (id), 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'); select (select max(id) from t2 where b=1 group by b) as x,b from t1 where b=1; x b diff --git a/mysql-test/t/subselect_innodb.test b/mysql-test/t/subselect_innodb.test index c17f3f30e39..affa6301db4 100644 --- a/mysql-test/t/subselect_innodb.test +++ b/mysql-test/t/subselect_innodb.test @@ -78,7 +78,7 @@ CREATE TABLE t1 ( c char(3) default NULL, PRIMARY KEY (id), 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'); CREATE TABLE t2 ( id int(11) NOT NULL default '0', @@ -86,7 +86,7 @@ CREATE TABLE t2 ( c char(3) default NULL, PRIMARY KEY (id), 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'); select (select max(id) from t2 where b=1 group by b) as x,b from t1 where b=1; drop table t1,t2; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1b03a70c43d..3f9492f1d72 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1586,7 +1586,8 @@ mysql_select(THD *thd, Item ***rref_pointer_array, } 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->used_tables=0; // Updated by setup_fields if (join->prepare(rref_pointer_array, tables, wild_num, |