database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '11.6' into 11.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-11-09 19:01:12 +01:00
parent 7aa28a2a54 d8dad8c3b5
commit b12ff287ec
789 changed files with 10342 additions and 4415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/funcs_1/r/innodb_views.result
View File

@ -4210,14 +4210,14 @@ Create view v1_1
as Select test.tb2.f59 as NewNameF1, test.tb2.f60 as NewNameF2
from tb2 limit 0,100 ;
SELECT NewNameF1,f60 FROM test.v1_1 ;
ERROR 42S22: Unknown column 'f60' in 'field list'
ERROR 42S22: Unknown column 'f60' in 'SELECT'
SELECT NewNameF1, v1_1.f60 FROM test.v1_1 ;
ERROR 42S22: Unknown column 'v1_1.f60' in 'field list'
ERROR 42S22: Unknown column 'v1_1.f60' in 'SELECT'
SELECT f59, f60 FROM test.v1 ;
ERROR 42S22: Unknown column 'f59' in 'field list'
ERROR 42S22: Unknown column 'f59' in 'SELECT'
Use test ;
SELECT F59 FROM v1 ;
ERROR 42S22: Unknown column 'F59' in 'field list'
ERROR 42S22: Unknown column 'F59' in 'SELECT'
Testcase 3.3.1.19
--------------------------------------------------------------------------------
@ -22454,7 +22454,7 @@ INSERT INTO t1 SET f1 = 0, f4x = 'ABC', report = 't1 1';
INSERT INTO v1 SET f1 = 0, f4 = 'ABC', report = 'v1 1';
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
INSERT INTO v1 SET f1 = 0, f4x = 'ABC', report = 'v1 1a';
ERROR 42S22: Unknown column 'f4x' in 'field list'
ERROR 42S22: Unknown column 'f4x' in 'INSERT INTO'
INSERT INTO v1 SET f1 = 0, report = 'v1 1b';
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
DESCRIBE t1;
@ -22757,7 +22757,7 @@ INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
f3 = -2.2, f4 = '<------ 20 -------->', report = 't1 9';
INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
f3 = -2.2, f4 = '<------ 20 -------->', report = 'v1 9';
ERROR 42S22: Unknown column 'f3' in 'field list'
ERROR 42S22: Unknown column 'f3' in 'INSERT INTO'
INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
f4 = '<------ 20 -------->', report = 'v1 9a';
DESCRIBE t1;

2
mysql-test/suite/funcs_1/r/is_column_privileges.result
View File

@ -262,7 +262,7 @@ GRANT USAGE ON *.* TO `testuser1`@`localhost`
GRANT ALL PRIVILEGES ON `test`.* TO `testuser1`@`localhost`
GRANT SELECT (`f3`, `f1`), UPDATE (`f1`) ON `db_datadict`.`my_table` TO `testuser1`@`localhost`
SELECT f1, f3 FROM db_datadict.my_table;
ERROR 42S22: Unknown column 'f3' in 'field list'
ERROR 42S22: Unknown column 'f3' in 'SELECT'
connection default;
ALTER TABLE db_datadict.my_table CHANGE COLUMN f1 my_col BIGINT;
SELECT * FROM information_schema.column_privileges

12
mysql-test/suite/funcs_1/r/memory_views.result
View File

@ -4211,14 +4211,14 @@ Create view v1_1
as Select test.tb2.f59 as NewNameF1, test.tb2.f60 as NewNameF2
from tb2 limit 0,100 ;
SELECT NewNameF1,f60 FROM test.v1_1 ;
ERROR 42S22: Unknown column 'f60' in 'field list'
ERROR 42S22: Unknown column 'f60' in 'SELECT'
SELECT NewNameF1, v1_1.f60 FROM test.v1_1 ;
ERROR 42S22: Unknown column 'v1_1.f60' in 'field list'
ERROR 42S22: Unknown column 'v1_1.f60' in 'SELECT'
SELECT f59, f60 FROM test.v1 ;
ERROR 42S22: Unknown column 'f59' in 'field list'
ERROR 42S22: Unknown column 'f59' in 'SELECT'
Use test ;
SELECT F59 FROM v1 ;
ERROR 42S22: Unknown column 'F59' in 'field list'
ERROR 42S22: Unknown column 'F59' in 'SELECT'
Testcase 3.3.1.19
--------------------------------------------------------------------------------
@ -22456,7 +22456,7 @@ INSERT INTO t1 SET f1 = 0, f4x = 'ABC', report = 't1 1';
INSERT INTO v1 SET f1 = 0, f4 = 'ABC', report = 'v1 1';
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
INSERT INTO v1 SET f1 = 0, f4x = 'ABC', report = 'v1 1a';
ERROR 42S22: Unknown column 'f4x' in 'field list'
ERROR 42S22: Unknown column 'f4x' in 'INSERT INTO'
INSERT INTO v1 SET f1 = 0, report = 'v1 1b';
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
DESCRIBE t1;
@ -22759,7 +22759,7 @@ INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
f3 = -2.2, f4 = '<------ 20 -------->', report = 't1 9';
INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
f3 = -2.2, f4 = '<------ 20 -------->', report = 'v1 9';
ERROR 42S22: Unknown column 'f3' in 'field list'
ERROR 42S22: Unknown column 'f3' in 'INSERT INTO'
INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
f4 = '<------ 20 -------->', report = 'v1 9a';
DESCRIBE t1;

12
mysql-test/suite/funcs_1/r/myisam_views-big.result
View File

@ -4680,14 +4680,14 @@ Create view v1_1
as Select test.tb2.f59 as NewNameF1, test.tb2.f60 as NewNameF2
from tb2 limit 0,100 ;
SELECT NewNameF1,f60 FROM test.v1_1 ;
ERROR 42S22: Unknown column 'f60' in 'field list'
ERROR 42S22: Unknown column 'f60' in 'SELECT'
SELECT NewNameF1, v1_1.f60 FROM test.v1_1 ;
ERROR 42S22: Unknown column 'v1_1.f60' in 'field list'
ERROR 42S22: Unknown column 'v1_1.f60' in 'SELECT'
SELECT f59, f60 FROM test.v1 ;
ERROR 42S22: Unknown column 'f59' in 'field list'
ERROR 42S22: Unknown column 'f59' in 'SELECT'
Use test ;
SELECT F59 FROM v1 ;
ERROR 42S22: Unknown column 'F59' in 'field list'
ERROR 42S22: Unknown column 'F59' in 'SELECT'
Testcase 3.3.1.19
--------------------------------------------------------------------------------
@ -24158,7 +24158,7 @@ INSERT INTO t1 SET f1 = 0, f4x = 'ABC', report = 't1 1';
INSERT INTO v1 SET f1 = 0, f4 = 'ABC', report = 'v1 1';
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
INSERT INTO v1 SET f1 = 0, f4x = 'ABC', report = 'v1 1a';
ERROR 42S22: Unknown column 'f4x' in 'field list'
ERROR 42S22: Unknown column 'f4x' in 'INSERT INTO'
INSERT INTO v1 SET f1 = 0, report = 'v1 1b';
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
DESCRIBE t1;
@ -24461,7 +24461,7 @@ INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
f3 = -2.2, f4 = '<------ 20 -------->', report = 't1 9';
INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
f3 = -2.2, f4 = '<------ 20 -------->', report = 'v1 9';
ERROR 42S22: Unknown column 'f3' in 'field list'
ERROR 42S22: Unknown column 'f3' in 'INSERT INTO'
INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
f4 = '<------ 20 -------->', report = 'v1 9a';
DESCRIBE t1;

4
mysql-test/suite/funcs_1/r/storedproc.result
View File

@ -3893,7 +3893,7 @@ SELECT count(*) into cnt from t2;
set @count = cnt;
SELECT @count;
END//
ERROR 42S22: Unknown column 'cnt' in 'field list'
ERROR 42S22: Unknown column 'cnt' in 'SET'
CALL sp1( 10 );
DROP PROCEDURE sp1;
CREATE PROCEDURE sp1( cnt int(20) )
@ -15599,7 +15599,7 @@ END;
END loop label1;
END//
CALL sp4();
ERROR 42S22: Unknown column 'idummy2' in 'field list'
ERROR 42S22: Unknown column 'idummy2' in 'SELECT'
DROP PROCEDURE sp4;
Testcase 4.3.5: