mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
After-merge fixes for merge of MySQL-5.1.38.
mysql-test/r/innodb.result: Fix wrong merge of result file conflicts. mysql-test/t/bug46080-master.opt: Fix memory limit to take into account extra storage engines in MariaDB. mysql-test/t/innodb.test: Add comment clarifying tricky --replace_result. sql/sql_select.cc: Restore fix of Bug#34374, accudentally lost during MySQL 5.1.38 merge. support-files/build-tags: Fix missing -R option for bzr, accidentally lost in MySQL-5.1.38 merge.
This commit is contained in:
@ -1738,7 +1738,7 @@ count(*)
|
||||
drop table t1;
|
||||
SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
|
||||
variable_value
|
||||
512
|
||||
511
|
||||
SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size';
|
||||
variable_value
|
||||
16384
|
||||
@ -1784,7 +1784,7 @@ innodb_sync_spin_loops 20
|
||||
SET @old_innodb_thread_concurrency= @@global.innodb_thread_concurrency;
|
||||
show variables like "innodb_thread_concurrency";
|
||||
Variable_name Value
|
||||
innodb_thread_concurrency 8
|
||||
innodb_thread_concurrency 0
|
||||
set global innodb_thread_concurrency=1001;
|
||||
Warnings:
|
||||
Warning 1292 Truncated incorrect thread_concurrency value: '1001'
|
||||
|
Reference in New Issue
Block a user