summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2006-08-1030-154/+1508
| | |\
| | | * amd64 atomic opsunknown2006-08-1030-154/+1508
| | * | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2006-08-103-32/+8
| | |\ \ | | | |/
* | | | Merge of recent MyISAM changes into Maria. Testsuite passes as muchunknown2006-10-1119-222/+368
* | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-10-10159-926/+51763
|\ \ \ \
| * | | | Maria: fixes for build failures in pushbuild. Comments, fixing of function na...unknown2006-09-213-11/+23
| |/ / /
| * | | Maria, very minor changes.unknown2006-09-202-2/+2
| * | | WL#3234 Maria Control file managerunknown2006-09-155-24/+19
| * | | WL#3071 Maria checkpoint:unknown2006-09-1410-22/+225
| * | | WL#3234 Maria control fileunknown2006-09-127-34/+9
| * | | WL#3234 Maria control file manager.unknown2006-09-1110-351/+592
| * | | There is a Maria category now in the bugs db (but only devsunknown2006-09-081-49/+0
| * | | a file to record known Maria bugs until we use a bugs db.unknown2006-09-071-0/+49
| * | | Manually merging changes made to MyISAM into Maria. End of merge.unknown2006-09-0714-65/+319
| * | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2006-09-07155-916/+51095
| |\ \ \
| | * | | Merge of Myisam changes into Maria.unknown2006-09-078-58/+7
| | * | | WL#3234 "Maria - control file manager":unknown2006-09-046-86/+168
| | * | | WL#3234 "Maria - control file manager"unknown2006-09-0111-90/+433
| | * | | write a magic string "MACF" (MAria Control File) at the start of the control ...unknown2006-08-302-37/+83
| | * | | importing Sanja's changes to the control file, with my changes on them.unknown2006-08-293-36/+147
| | * | | Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-mariaunknown2006-08-295-26/+27
| | |\ \ \
| | | * | | just comment changes and line formatting changes.unknown2006-08-295-26/+27
| | | |/ /
| | * | | Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-mariaunknown2006-08-147-1/+5324
| | |\ \ \ | | | |/ / | | |/| |
| | | * | The pagae cache added.unknown2006-07-067-1/+5323
| | * | | adding handler flag missing from previous merge, for Mariaunknown2006-08-101-1/+1
| | * | | Completion of merge of mysql-5.1 into mysql-maria.unknown2006-08-1043-526/+950
| | * | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2unknown2006-08-09150-915/+44813
| | |\ \ \
| | | * | | Writing down MikaelR's comments made in May in Helsinki so that they are not ...unknown2006-07-263-27/+59
| | | * | | two include files were missing in the source tarball, causing pushbuild build...unknown2006-07-261-1/+1
| | | * | | Post-vacation-musing fixes to WL#3071 "Maria checkpoint":unknown2006-07-243-179/+169
| | | |/ /
| | | * | postmerge fixunknown2006-05-245-11/+28
| | | * | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1unknown2006-05-24149-917/+44782
| | | |\ \
| | | | * | WL#3270 "Maria - cleanups of inherited MyISAM functionality"unknown2006-05-0522-1196/+13
| | | | * | WL#3072 Maria recovery, small fixes to pseudocode, discussion why no checkpoi...unknown2006-05-042-3/+20
| | | | * | Maria: first version of checkpoint (WL#3071), least-recently-dirtied page flu...unknown2006-04-278-0/+937
| | | | * | Exact same change as the one I just pushed in 5.1-new: 10 MB is enough for mo...unknown2006-04-121-1/+1
| | | | * | easy fixes to ma_test_all (to make shell happy)unknown2006-04-121-128/+128
| | | | * | Add ma_test_all.resunknown2006-04-111-0/+53
| | | | * | mergeunknown2006-04-11145-872/+44963
| | | | |\ \
| | | | | * | Added storage/maria (based on MyISAM). WL#3245unknown2006-04-11145-917/+44963
| | | | * | | post-commit:unknown2006-04-051-45/+0
| | | | |/ /
* | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-workunknown2006-10-101-2/+1
|\ \ \ \ \ \
| * | | | | | ndb -unknown2006-10-101-2/+1
* | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1unknown2006-10-10634-10966/+28073
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-enginesunknown2006-10-081-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | After merge fix.unknown2006-10-081-1/+1
| * | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-10-087-23/+86
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-enginesunknown2006-10-061-1/+14
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-enginesunknown2006-10-061-1/+14
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginesunknown2006-10-061-1/+14
| | | | |\ \ \ \ \ \ \