diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-09-11 13:00:53 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-09-11 13:00:53 +0200 |
| commit | 66a1902a01bcdc6ad42187339417a739847a4dd4 (patch) | |
| tree | 06b55289e53e919149de7ddf5a2b1d4d2c178c40 /mysql-test/r | |
| parent | 30ce64cbee7f2abf6c0bf108159d8ba02772016c (diff) | |
| download | mariadb-git-66a1902a01bcdc6ad42187339417a739847a4dd4.tar.gz | |
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.
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/innodb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 037793698a2..44c436e00ff 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -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' |