mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2440 commits 2774 branches 343 tags 1.6 GiB
Commit graph

1107 commits

Author SHA1 Message Date
Dave Wells
e57b5d0110 merge second round of changes to support logcursors into main, refs[t:1857] 
git-svn-id: file:///svn/toku/tokudb@13515 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:56 -04:00
Yoni Fogel
2ef08187e7 Addresses #1868 Delete unnecessary assert 
Done to main and 2.1.0
refs [t:1868]

git-svn-id: file:///svn/toku/tokudb@13485 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:56 -04:00
Yoni Fogel
110754f57c 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
Rich Prohaska
363e371758 merge the enqrootentry and shutdown log entry changes to main. addresses #1847 
git-svn-id: file:///svn/toku/tokudb@13453 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:56 -04:00
Dave Wells
ae97a6dae5 remove failing test 
git-svn-id: file:///svn/toku/tokudb@13433 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Dave Wells
d6e96be1f0 MERGE tokudb/toku/tokudb/1857 into main, refs [t:1857] 
git-svn-id: file:///svn/toku/tokudb@13431 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Yoni Fogel
a102472122 Addresses #1849 If a child prelocks a table (and gains the magic 'no rolltmp needed' flag), 
it can pass it to its parent when it commits.

git-svn-id: file:///svn/toku/tokudb@13338 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Yoni Fogel
2e7835e6b5 Closes #1868 A parent can prelock a table, and then the child, or vice versa without crashing. 
This does not add any performance optimizations

git-svn-id: file:///svn/toku/tokudb@13337 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Yoni Fogel
be608a5f70 Fix windows build. 
git-svn-id: file:///svn/toku/tokudb@13298 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Rich Prohaska
d9b5e99a08 add the timestamp log entry. addresses #1855 
git-svn-id: file:///svn/toku/tokudb@13284 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Rich Prohaska
73e060e3bc merge tokudb.1856 13208:HEAD to main. addresses #1856 
git-svn-id: file:///svn/toku/tokudb@13278 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Dave Wells
68df634693 MERGE tokudb.logchanges2 13168:13253 into main 
git-svn-id: file:///svn/toku/tokudb@13261 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Zardosht Kasheff
37992fd62e address build, get compiling on windows thanks to Yoni 
git-svn-id: file:///svn/toku/tokudb@13196 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Bradley C. Kuszmaul
719786c001 Fixes #1848 (add parent txn to xstillopen). 
git-svn-id: file:///svn/toku/tokudb@13131 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Bradley C. Kuszmaul
43b8c94f9c Fixes #1846. 
git-svn-id: file:///svn/toku/tokudb@13130 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Rich Prohaska
289551902f 1st cut at verifying the lsn sequence. addresses #1837 
git-svn-id: file:///svn/toku/tokudb@13093 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Yoni Fogel
4bfd18986e Addresses #1842 Fix warnings 
git-svn-id: file:///svn/toku/tokudb@13077 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Yoni Fogel
53a12b9706 Addresses #1842 Fix le_any_val (LE_BOTH) to return the provisional value. 
git-svn-id: file:///svn/toku/tokudb@13076 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Rich Prohaska
90e210cd94 merge tokudb.1828 -r 12939:HEAD to main. closes #1828 
git-svn-id: file:///svn/toku/tokudb@13006 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Rich Prohaska
7ba09091c4 make the interactive help better 
git-svn-id: file:///svn/toku/tokudb@12921 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:54 -04:00
Bradley C. Kuszmaul
59c5ea00e0 Merge 1781 back to main line. Closes #1781 (since #1781 involves creating a test.) There is a bug exposed by the x2.tdb test, but actually making the x2 test run right is a separate issue (Refs #1823). 
{{{
svn merge -r 12282:12548 https://svn.tokutek.com/tokudb/toku/tokudb.1781
}}}


git-svn-id: file:///svn/toku/tokudb@12860 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:54 -04:00
Rich Prohaska
7fdfb60a3e merge tokudb.1802 rev 12722:HEAD tokudb. addresses #1802 
git-svn-id: file:///svn/toku/tokudb@12779 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:54 -04:00
Rich Prohaska
a255cd1672 build with icc on linux 
git-svn-id: file:///svn/toku/tokudb@12742 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:54 -04:00
Rich Prohaska
e5fb3970bb merge 1766b to main. addresses #1766 
git-svn-id: file:///svn/toku/tokudb@12577 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:54 -04:00
Rich Prohaska
1ea7ce00b4 abstract stdint.h for solaris. addresses #1789 
git-svn-id: file:///svn/toku/tokudb@12569 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:54 -04:00
Yoni Fogel
173695c194 Closes #1790 Merge changes from 2.0.1 into main 
svn merge --accept=postpone -r 12461:12467 ../../mysql.branches/2.0.1/tokudb/

git-svn-id: file:///svn/toku/tokudb@12468 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Yoni Fogel
daa05c3f29 Closes #1790 Merge from 2.0.1 into main. Also add tests to freebsd. 
svn merge --accept=postpone -r 12459:12461 ../../mysql.branches/2.0.1/tokudb/

git-svn-id: file:///svn/toku/tokudb@12462 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Rich Prohaska
3ea335abdb freebsd port. addresses #1789 
git-svn-id: file:///svn/toku/tokudb@12444 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Yoni Fogel
bc9fd74c80 Merge 2.0.0 back into main 
svn merge --accept=postpone -r 12123:12373 ../../mysql.branches/2.0.0/tokudb/

git-svn-id: file:///svn/toku/tokudb@12375 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Bradley C. Kuszmaul
84432d75f8 Merge tokudb.1779 onto mainline. Fixes #1779. 
git-svn-id: file:///svn/toku/tokudb@12281 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Bradley C. Kuszmaul
6df3b7e6db Fixes #1775 (logformat execv error) 
git-svn-id: file:///svn/toku/tokudb@12146 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Bradley C. Kuszmaul
6c211758b1 Merge 1767 into main line (including 1768 and 1627 fixes) and delete 1767 branch. Fixes #1767. Refs #1768, 1627. 
git-svn-id: file:///svn/toku/tokudb@12140 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Barry Perlman
e191dd014e Merged from 2.0.0 branch with command: 
svn merge -r12118:HEAD ../../mysql.branches/2.0.0/tokudb/

git-svn-id: file:///svn/toku/tokudb@12124 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Yoni Fogel
845f7c37bb Addresses #1765, #1730, #1733, Merge 12079:12119 from 2.0.0 into main 
git-svn-id: file:///svn/toku/tokudb@12121 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Rich Prohaska
80c3cbb7de fix linux compile. addresses #1765 
git-svn-id: file:///svn/toku/tokudb@12083 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Yoni Fogel
049c7625a3 Addresses #1765 Merge [12079] into main (pthreads-win32 for windows) 
git-svn-id: file:///svn/toku/tokudb@12081 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Yoni Fogel
4def00f108 Closes #1756 Merge fix for #1756 [11989] from 2.0.0 into main 
git-svn-id: file:///svn/toku/tokudb@11990 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Barry Perlman
7568a5a895 Addresses #1745 Merge fix from 2.0.0 branch into main with command svn merge -c 11736 ../../mysql.branches/2.0.0/tokudb (inside toku/tokudb) 
git-svn-id: file:///svn/toku/tokudb@11756 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:52 -04:00
Rich Prohaska
c21fa48316 merge more of 1735 to main. addresses #1735 
git-svn-id: file:///svn/toku/tokudb@11732 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:52 -04:00
Barry Perlman
2197511394 Add some debug info 
git-svn-id: file:///svn/toku/tokudb@11715 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:52 -04:00
Barry Perlman
ff57e4c617 Fixes #1735 Merge from tokudb.1735 to main with command: 
svn merge -r11656:HEAD ../tokudb.1735 (executed in main sandbox)

git-svn-id: file:///svn/toku/tokudb@11714 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:52 -04:00
Barry Perlman
df9cd04035 Closes #1741, Addresses #1398 Fix Makefiles to expose BRT_LEVEL_STRADDLE_CALLBACK_LOGIC_NOT_READY 
to all files that need it in both src/ and newbrt/ levels.

git-svn-id: file:///svn/toku/tokudb@11701 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:52 -04:00
Barry Perlman
9beaf96697 Improved comments only 
git-svn-id: file:///svn/toku/tokudb@11700 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:52 -04:00
Bradley C. Kuszmaul
08d183f468 Add test for {{{sync_synchronize}}}. Refs #1738. 
git-svn-id: file:///svn/toku/tokudb@11680 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:51 -04:00
Bradley C. Kuszmaul
e832247e8e Add test for {{{sync_lock_test_and_set}}}. Refs #1738. 
git-svn-id: file:///svn/toku/tokudb@11679 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:51 -04:00
Bradley C. Kuszmaul
03917acaf2 Add a test for the {{{__sync_lock_test_and_set}}} intrinsic. Refs #1738. 
git-svn-id: file:///svn/toku/tokudb@11677 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:51 -04:00
Bradley C. Kuszmaul
3e024139cf Add a test for the {{{__sync_lock_test_and_set}}} intrinsic. Refs #1738. 
git-svn-id: file:///svn/toku/tokudb@11676 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:51 -04:00
Bradley C. Kuszmaul
c2a17a61ff Add a test for the {{{__sync_lock_test_and_set}}} intrinsic. Refs #1738. 
git-svn-id: file:///svn/toku/tokudb@11675 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:51 -04:00
Bradley C. Kuszmaul
f205dde77b Write better timing code for trylock. Refs #1738. 
git-svn-id: file:///svn/toku/tokudb@11673 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:51 -04:00
Bradley C. Kuszmaul
a9b8ed234c Write better timing code for trylock. Refs #1738. 
git-svn-id: file:///svn/toku/tokudb@11672 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:51 -04:00