summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* union.result:Sinisa@sinisa.nasamreza.org2005-04-263-1/+31
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2005-04-251-2/+2
|\
| * Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040 dlenev@brandersnatch.localdomain2005-04-251-2/+2
* | ndb - bug#10029 fixpekka@mysql.com2005-04-237-90/+205
* | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-04-224-52/+154
|\ \
| * | Fix for Bug #9318 drop database does not drop ndb tablesmskold@mysql.com2005-04-224-52/+154
* | | Bug#7806 - insert on duplicate key and auto-update of timestampingo@mysql.com2005-04-222-9/+16
| |/ |/|
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-04-211-3/+3
|\ \
| * | C99 Portability fixmsvensson@neptunus.(none)2005-04-211-3/+3
| |/
* | - added missing file config_readline.h to the source distributionlenz@mysql.com2005-04-211-1/+1
|/
* Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-04-211-1/+4
|\
| * Fix for failing ps_7ndb.test, force write_row when batching inserts so that u...mskold@mysql.com2005-04-211-1/+4
* | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-04-214-11/+60
|\ \ | |/ |/|
| * Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-04-214-1/+40
| |\
| * \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-04-204-11/+60
| |\ \
| | * | - Enabled the "blackhole" storage engine for the Max RPM subpackagelenz@mysql.com2005-04-201-0/+5
| | * | - manual mergelenz@mysql.com2005-04-193-11/+55
| | |\ \
| | | * | - added missing copyright headers to several Makefile.am's (noticedlenz@mysql.com2005-04-193-0/+48
| | | * | Updated Docs/Makefile.am:lenz@mysql.com2005-04-191-10/+22
| | | * | - removed COPYING from txt_files of Docs/Makefile.amlenz@mysql.com2005-04-191-1/+1
* | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-04-2141-105/+258
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2005-04-211-0/+1
| |\ \ \ \
| | * | | | Fix for bug #7344 (Repeating mysql_server_start/mysql_server_end crash clients)hf@deer.(none)2005-04-211-0/+1
| * | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2005-04-203-1/+39
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | sql_select.cc:igor@rurik.mysql.com2005-04-193-1/+39
| | | |/ / | | |/| |
| * | | | ndb - dbug aid for api signal logpekka@mysql.com2005-04-201-0/+4
| * | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-04-205-14/+154
| |\ \ \ \
| | * \ \ \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-04-205-14/+154
| | |\ \ \ \
| | | * | | | Bug#7806 - insert on duplicate key and auto-update of timestampingo@mysql.com2005-04-195-14/+154
| * | | | | | After review fixmsvensson@neptunus.(none)2005-04-201-4/+8
| * | | | | | Mergemsvensson@neptunus.(none)2005-04-2031-90/+56
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | BUG#9568 mysql segfaults from CTRL-R msvensson@neptunus.(none)2005-04-1931-90/+56
* | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-04-2025-23/+84
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Removed forgotten abort() call, bug#10001mskold@mysql.com2005-04-201-1/+0
| * | | | | | Disabled ndb tests for embeddedmskold@mysql.com2005-04-1922-0/+22
| * | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-04-193-22/+62
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix for Bug #9691 UPDATE fails on attempt to update primary keymskold@mysql.com2005-04-193-22/+62
* | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-206-95/+150
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2005-04-191-4/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Style change. Use 1 and 0 instead of true and false.jan@hundin.mysql.fi2005-04-191-4/+4
| | |/ / / /
| * | | | | CSC5149 - ndb test programsjoreland@mysql.com2005-04-191-2/+2
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2005-04-183-69/+108
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@brandersnatch.localdomain2005-04-183-69/+108
| | |\ \ \ \
| | | * | | | Fix for bug #8068 "TIMEDIFF with first negative argument gives wrong dlenev@brandersnatch.localdomain2005-03-283-69/+108
| * | | | | | Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).jan@hundin.mysql.fi2005-04-182-22/+38
| |/ / / / /
* | | | | | Fix for BUG#9103: sergefp@mysql.com2005-04-185-8/+41
|/ / / / /
* | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-173-2/+34
|\ \ \ \ \
| * | | | | Fix for BUG#9439:sergefp@mysql.com2005-04-163-2/+34
* | | | | | Merge mysql.com:/space/my/mysql-4.0-buildlenz@mysql.com2005-04-171-2/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.amlenz@mysql.com2005-04-171-2/+1