← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/tests/r/innodb.result

  • Committer: Lee Bieber
  • Date: 2010-12-08 03:25:22 UTC
  • mfrom: (1977.1.6 build)
  • Revision ID: kalebral@gmail.com-20101208032522-p28o64pzi0etpd5g
Merge Andrew - fix for drizzledump bugs
Merge Brian - Fixed a couple of assert() and added abort where program logic would corrupt the instance
Merge Monty - more sys_var work, pbms and pbxt and some vars in innodb

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/tests/r/innodb.result
1446
1446
innodb_thread_concurrency       0
1447
1447
set global innodb_thread_concurrency=1001;
1448
1448
Warnings:
1449
 
Error   1292    Truncated incorrect thread_concurrency value: '1001'
 
1449
Error   1524    Error setting innodb_thread_concurrency. Given value 1001 (> 1000)
1450
1450
show variables like "innodb_thread_concurrency";
1451
1451
Variable_name   Value
1452
 
innodb_thread_concurrency       1000
 
1452
innodb_thread_concurrency       0
1453
1453
set global innodb_thread_concurrency=0;
1454
1454
show variables like "innodb_thread_concurrency";
1455
1455
Variable_name   Value
1467
1467
innodb_concurrency_tickets      1000
1468
1468
set global innodb_concurrency_tickets=0;
1469
1469
Warnings:
1470
 
Error   1292    Truncated incorrect concurrency_tickets value: '0'
 
1470
Error   1524    Error setting innodb_concurrency_tickets. Given value 0 (< 1)
1471
1471
show variables like "innodb_concurrency_tickets";
1472
1472
Variable_name   Value
1473
 
innodb_concurrency_tickets      1
 
1473
innodb_concurrency_tickets      1000
1474
1474
set global innodb_concurrency_tickets=500;
1475
1475
show variables like "innodb_concurrency_tickets";
1476
1476
Variable_name   Value