mariadb/test.wiki

 * One
 * two
 1. FOO
  a. sock
  a. pizza
 2. elephant

[[Include(source:toku/tokudb.1125/test2.wiki,wiki)]]
Addresses #1125 Merged nested transactions from temporary merge branch into main. Current tests fail (not regressions, they fail as of 13461) * {{{x1.tdbrun}}} * {{{test_log(2,3,4,5,6,7,8,9,10).recover}}} * {{{test-recover(1,2,3).tdbrun}}} * {{{test1324.tdbrun}}} ULE_DEBUG disabled (defined to 0) Can be re-enabled for test purposes (set to 1). refs [t:1125] Merging into the temp branch (tokudb.main_13461+1125) {{{svn merge --accept=postpone -r 12527:13461 ../tokudb.1125 ./}}} Merging into main {{{svn merge --accept=postpone -r13462:13463 ../tokudb.main_13461+1125/ ./}}} git-svn-id: file:///svn/toku/tokudb@13464 c7de825b-a66e-492c-adef-691d508d4ae1 2013-04-16 23:57:56 -04:00			`* One`
			`* two`
			`1. FOO`
			`a. sock`
			`a. pizza`
			`2. elephant`

			`[[Include(source:toku/tokudb.1125/test2.wiki,wiki)]]`