3061 Vladislav Vaintroub 2009-03-12 [merge]
merge
modified:
mysql-test/suite/falcon_team/r/falcon_deadlock.result
mysql-test/suite/falcon_team/t/falcon_deadlock.test
=== modified file 'mysql-test/suite/falcon/r/falcon_options.result'
--- a/mysql-test/suite/falcon/r/falcon_options.result 2009-02-27 13:04:16 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options.result 2009-03-12 06:10:52 +0000
@@ -9,6 +9,7 @@ falcon_consistent_read ON
falcon_debug_server OFF
falcon_debug_trace 0
falcon_direct_io 1
+falcon_error_inject
falcon_gopher_threads 5
falcon_index_chill_threshold 4194304
falcon_io_threads 2
@@ -90,6 +91,7 @@ FALCON_DEBUG_MASK 4096
FALCON_DEBUG_SERVER OFF
FALCON_DEBUG_TRACE 0
FALCON_DIRECT_IO 1
+FALCON_ERROR_INJECT
FALCON_GOPHER_THREADS 5
FALCON_INDEX_CHILL_THRESHOLD 1073741824
FALCON_IO_THREADS 2
=== modified file 'mysql-test/suite/falcon/r/falcon_options2.result'
--- a/mysql-test/suite/falcon/r/falcon_options2.result 2009-02-27 13:04:16 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options2.result 2009-03-12 06:10:52 +0000
@@ -9,6 +9,7 @@ FALCON_CONSISTENT_READ ON
FALCON_DEBUG_SERVER OFF
FALCON_DEBUG_TRACE 0
FALCON_DIRECT_IO 1
+FALCON_ERROR_INJECT
FALCON_GOPHER_THREADS 5
FALCON_INDEX_CHILL_THRESHOLD 4194304
FALCON_IO_THREADS 2
Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20090312064940-w3ni3frmnov27onp.bundle
| Thread |
|---|
| • bzr push into mysql-6.0-falcon-team branch (vvaintroub:3061) | Vladislav Vaintroub | 12 Mar |
