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

Merge branch '10.11' into 11.2

This commit is contained in:
Oleksandr Byelkin
2024-10-29 16:39:47 +01:00
660 changed files with 8148 additions and 3604 deletions

View File

@ -4443,7 +4443,7 @@ begin
update t3 set id=2, county=value(c);
end|
call bug15441('county')|
ERROR 42S22: Unknown column 'c' in 'field list'
ERROR 42S22: Unknown column 'c' in 'SELECT'
drop procedure bug15441|
create procedure bug15441(county varchar(25))
begin
@ -6933,9 +6933,9 @@ BEGIN
SELECT a FROM t1 A WHERE A.b IN (SELECT b FROM t2 AS B);
END|
CALL p1;
ERROR 42S22: Unknown column 'A.b' in 'IN/ALL/ANY subquery'
ERROR 42S22: Unknown column 'A.b' in 'IN/ALL/ANY'
CALL p1;
ERROR 42S22: Unknown column 'A.b' in 'IN/ALL/ANY subquery'
ERROR 42S22: Unknown column 'A.b' in 'IN/ALL/ANY'
DROP PROCEDURE p1;
DROP TABLE t1, t2;
#
@ -7908,11 +7908,11 @@ drop table t1,t2;
CREATE TABLE t1 (a INT, b VARCHAR(32));
CREATE PROCEDURE sp() SELECT * FROM t1 AS t1x JOIN t1 AS t1y USING (c);
CALL sp;
ERROR 42S22: Unknown column 'c' in 'from clause'
ERROR 42S22: Unknown column 'c' in 'FROM'
CALL sp;
ERROR 42S22: Unknown column 'c' in 'from clause'
ERROR 42S22: Unknown column 'c' in 'FROM'
CALL sp;
ERROR 42S22: Unknown column 'c' in 'from clause'
ERROR 42S22: Unknown column 'c' in 'FROM'
alter table t1 add column c int;
CALL sp;
c a b a b
@ -7931,11 +7931,11 @@ CALL sp;
ERROR HY000: Table 'v1' was not locked with LOCK TABLES
UNLOCK TABLES;
CALL sp;
ERROR 42S22: Unknown column 'b' in 'order clause'
ERROR 42S22: Unknown column 'b' in 'ORDER BY'
CALL sp;
ERROR 42S22: Unknown column 'b' in 'order clause'
ERROR 42S22: Unknown column 'b' in 'ORDER BY'
CALL sp;
ERROR 42S22: Unknown column 'b' in 'order clause'
ERROR 42S22: Unknown column 'b' in 'ORDER BY'
DROP PROCEDURE sp;
CREATE PROCEDURE sp() UPDATE v1 SET a = 1 WHERE a=1 and b=2;
LOCK TABLE t2 READ;
@ -7943,11 +7943,11 @@ CALL sp;
ERROR HY000: Table 'v1' was not locked with LOCK TABLES
UNLOCK TABLES;
CALL sp;
ERROR 42S22: Unknown column 'b' in 'where clause'
ERROR 42S22: Unknown column 'b' in 'WHERE'
CALL sp;
ERROR 42S22: Unknown column 'b' in 'where clause'
ERROR 42S22: Unknown column 'b' in 'WHERE'
CALL sp;
ERROR 42S22: Unknown column 'b' in 'where clause'
ERROR 42S22: Unknown column 'b' in 'WHERE'
DROP PROCEDURE sp;
DROP VIEW v1;
DROP TABLE t1, t2;
@ -8379,7 +8379,7 @@ DROP PROCEDURE p1;
#
CREATE OR REPLACE PROCEDURE p1 (a VARCHAR(10)) SELECT 1;
CALL p1(a);
ERROR 42S22: Unknown column 'a' in 'field list'
ERROR 42S22: Unknown column 'a' in 'CALL'
drop procedure p1;
CREATE OR REPLACE PROCEDURE p1 (a VARCHAR(10)) SELECT a|
CREATE OR REPLACE PROCEDURE p2 ()