database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity

Manual merge of #11335 bugfix

Browse Source
This commit is contained in:
evgen@moonbone.local
2005-08-05 00:34:42 +04:00
parent 069fb89bb9 fa0ea36507
commit 1894cff045
7 changed files with 77 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/r/subselect.result
View File

@@ -1087,24 +1087,24 @@ CREATE TABLE t1 SELECT * FROM (SELECT 1 as a,(SELECT 1)) a;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bigint(20) NOT NULL default '0',
`(SELECT 1)` bigint(20) NOT NULL default '0'
`a` bigint(1) NOT NULL default '0',
`(SELECT 1)` bigint(1) NOT NULL default '0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
CREATE TABLE t1 SELECT * FROM (SELECT 1 as a,(SELECT a)) a;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bigint(20) NOT NULL default '0',
`(SELECT a)` bigint(20) NOT NULL default '0'
`a` bigint(1) NOT NULL default '0',
`(SELECT a)` bigint(1) NOT NULL default '0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
CREATE TABLE t1 SELECT * FROM (SELECT 1 as a,(SELECT a+0)) a;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bigint(20) NOT NULL default '0',
`(SELECT a+0)` bigint(20) NOT NULL default '0'
`a` bigint(1) NOT NULL default '0',
`(SELECT a+0)` bigint(3) NOT NULL default '0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
CREATE TABLE t1 SELECT (SELECT 1 as a UNION SELECT 1+1 limit 1,1) as a;

13
mysql-test/r/view.result
View File

@@ -566,7 +566,7 @@ select * from v1;
col1
describe v1;
Field Type Null Key Default Extra
col1 varchar(2) YES NULL
col1 char(2) YES NULL
drop view v1;
drop table `t1a``b`;
create table t1 (col1 char(5),col2 char(5));
@@ -2007,6 +2007,17 @@ A
B
DROP VIEW v1;
DROP TABLE t1;
create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);
create view v1 as select * from t1;
desc v1;
Field Type Null Key Default Extra
f1 tinyint(1) YES NULL
f2 char(1) YES NULL
f3 varchar(1) YES NULL
f4 geometry YES NULL
f5 datetime YES NULL
drop view v1;
drop table t1;
CREATE TABLE t1 ( bug_table_seq INTEGER NOT NULL);
CREATE OR REPLACE VIEW v1 AS SELECT * from t1;
DROP PROCEDURE IF EXISTS p1;

8
mysql-test/r/view_grant.result
View File

@@ -72,12 +72,12 @@ select c from mysqltest.v4;
c
show columns from mysqltest.v1;
Field Type Null Key Default Extra
c bigint(20) YES NULL
d bigint(20) YES NULL
c bigint(12) YES NULL
d bigint(12) YES NULL
show columns from mysqltest.v2;
Field Type Null Key Default Extra
c bigint(20) YES NULL
d bigint(20) YES NULL
c bigint(12) YES NULL
d bigint(12) YES NULL
explain select c from mysqltest.v1;
ERROR HY000: EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v1;

9
mysql-test/t/view.test
View File

@@ -1855,6 +1855,15 @@ DROP PROCEDURE p1;
DROP VIEW v1;
DROP TABLE t1;
#
# Bug #11335 View redefines column types
#
create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);
create view v1 as select * from t1;
desc v1;
drop view v1;
drop table t1;
#
# Bug #11760 Typo in Item_func_add_time::print() results in NULLs returned
# subtime() in view