database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merged fix for bug #58650 "Failing assertion:

Browse Source 
primary_key_no == -1 || primary_key_no == 0"
with recent changes from mysql-5.5 tree.
This commit is contained in:
Dmitry Lenev
2011-02-02 16:58:13 +03:00
parent 5c3151e4ef c711ce6726
commit d98270e1a3
10 changed files with 80 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/r/filesort_debug.result Normal file
View File

@@ -0,0 +1,16 @@
SET @old_debug= @@session.debug;
#
# Bug#36022 please log more information about "Sort aborted" queries
#
CREATE TABLE t1(f0 int auto_increment primary key, f1 int);
INSERT INTO t1(f1) VALUES (0),(1),(2),(3),(4),(5);
SET session debug= '+d,make_char_array_fail';
CALL mtr.add_suppression("Out of sort memory");
SELECT * FROM t1 ORDER BY f1 ASC, f0;
ERROR HY001: Out of sort memory, consider increasing server sort buffer size
SET session debug= @old_debug;
CREATE FUNCTION f1() RETURNS INT RETURN 1;
DELETE FROM t1 ORDER BY (f1(10)) LIMIT 1;
ERROR 42000: Incorrect number of arguments for FUNCTION test.f1; expected 0, got 1
DROP TABLE t1;
DROP FUNCTION f1;

3
mysql-test/r/order_by.result
View File

@@ -1425,8 +1425,9 @@ set session sort_buffer_size= 30000;
Warnings:
Warning 1292 Truncated incorrect sort_buffer_size value: '30000'
set session max_sort_length= 2180;
CALL mtr.add_suppression("Out of sort memory");
select * from t1 order by b;
ERROR HY001: Out of sort memory; increase server sort buffer size
ERROR HY001: Out of sort memory, consider increasing server sort buffer size
drop table t1;
#
# Bug #39844: Query Crash Mysql Server 5.0.67