Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new | monty@mysql.com | 2006-03-30 | 3 | -5/+6 |
|\ | | | | | | | into mysql.com:/home/my/mysql-5.1 | ||||
| * | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new | acurtis@xiphis.org | 2006-03-29 | 3 | -5/+6 |
| |\ | | | | | | | | | | into xiphis.org:/home/antony/work2/p1-bug18464 | ||||
| | * | Bug#18464 | acurtis@xiphis.org | 2006-03-28 | 3 | -5/+6 |
| | | | | | | | | | | | | | | | "Can't make example storage engine available" Build was attempting a shared-lib build instead of static | ||||
* | | | Merge monty@192.168.0.9:/my/mysql-5.1 | monty@mysql.com | 2006-03-29 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1 | ||||
| * | | | Safety fix to ensure that long event names always ends with \0 | monty@mysql.com | 2006-03-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | This removes a warning about missing DBUG_ENTER while running tests | ||||
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new | monty@mysql.com | 2006-03-29 | 13 | -5/+22 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | into mysql.com:/home/my/mysql-5.1 | ||||
| * | | Remove compiler warnings | monty@mysql.com | 2006-03-29 | 12 | -5/+21 |
| | | | | | | | | | | | | | | | | | | Add missing DBUG_RETURN Fixed stack overflow in NdbBlob (found by ndb_gis.test) Fixed access to freed memory in ndb_cluster_real_free_share() | ||||
| * | | Fixed compiler and valgrind warnings | monty@mysql.com | 2006-03-29 | 1 | -0/+1 |
| |/ | | | | | | | | | | | | | | | | | | | Added missing DBUG_xxx_RETURN statements Fixed some usage of not initialized variables (as found by valgrind) Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called. This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names() This will allow Tomas to continue with his work to use namelocks to syncronize things. Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests | ||||
* | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new | petr@mysql.com | 2006-03-29 | 2 | -21/+379 |
|\ \ | | | | | | | | | | into mysql.com:/home/cps/mysql/devel/5.1-repair-csv | ||||
| * | | Post-review fixes for WL#3154 "Enable REPAIR for CSV tables" | petr@mysql.com | 2006-03-29 | 2 | -27/+47 |
| | | | |||||
| * | | WL#3154 "Enable REPAIR for CSV tables". | petr@mysql.com | 2006-03-13 | 2 | -23/+361 |
| | | | | | | | | | | | | | | | This is the first commit. Cleanups are likely to follow after the merge. | ||||
* | | | some simple CMAKE updates | reggie@big_geek. | 2006-03-28 | 1 | -0/+5 |
| | | | |||||
* | | | Merge bk-internal:/home/bk/mysql-5.1-new | knielsen@mysql.com | 2006-03-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/tmpbuild | ||||
| * | | | ndb test: remove not needed setting causing compile error | tomas@poseidon.ndb.mysql.com | 2006-03-28 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Manual merge. | knielsen@mysql.com | 2006-03-28 | 11 | -12/+89 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add missing cmakelists.txt for archive. | knielsen@mysql.com | 2006-03-24 | 1 | -0/+6 |
| | | | |||||
| * | | Some changes to make it possible to build for Windows with CMake from | knielsen@mysql.com | 2006-03-24 | 8 | -5/+11 |
| | | | | | | | | | | | | a normal 'make dist' source .tar.gz. | ||||
| * | | Updated CMake stuff to handle the configurations needed for release | knielsen@mysql.com | 2006-03-23 | 2 | -7/+72 |
| | | | | | | | | | | | | builds. | ||||
* | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new | tomas@poseidon.ndb.mysql.com | 2006-03-27 | 5 | -14/+272 |
|\ \ \ | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new | ||||
| * | | | Bug #18491 cluster: node restart with pending dropeed events causes failed ↵ | tomas@poseidon.ndb.mysql.com | 2006-03-27 | 5 | -14/+272 |
| | | | | | | | | | | | | | | | | restart | ||||
* | | | | ATRT documentation | skozlov@mysql.com | 2006-03-27 | 2 | -0/+516 |
| | | | | |||||
* | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new | jonas@perch.ndb.mysql.com | 2006-03-27 | 4 | -12/+37 |
|\ \ \ \ | |/ / / |/| | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new | ||||
| * | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-work | jonas@perch.ndb.mysql.com | 2006-03-27 | 4 | -12/+37 |
| | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new | ||||
* | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new | mskold@mysql.com | 2006-03-24 | 7 | -8/+68 |
|\ \ \ \ | |/ / / |/| | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new | ||||
| * | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new | mskold@mysql.com | 2006-03-24 | 7 | -8/+68 |
| |\ \ \ | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new | ||||
| | * | | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 | mskold@mysql.com | 2006-03-23 | 7 | -8/+68 |
| | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new | ||||
* | | | | | ndb autotest | jonas@perch.ndb.mysql.com | 2006-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | fix \ in makefile (merge error) | ||||
* | | | | | ndb - bug#18295 | jonas@perch.ndb.mysql.com | 2006-03-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | more work-arounds for gcc4 | ||||
* | | | | | ndb - | jonas@perch.ndb.mysql.com | 2006-03-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | more compiler warnings... | ||||
* | | | | | ndb - | jonas@perch.ndb.mysql.com | 2006-03-24 | 3 | -7/+31 |
| | | | | | | | | | | | | | | | | | | | | still some compiler warnings | ||||
* | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb | jonas@perch.ndb.mysql.com | 2006-03-24 | 4 | -16/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new | ||||
| * \ \ \ \ | Merge ndbdev@ndbmaster.mysql.com:jonas/mysql-5.1-new | jonas@perch.ndb.mysql.com | 2006-03-24 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new | ||||
| | * | | | | - corrected bug causing hang in getTable when using blob tables | tomas@poseidon.ndb.mysql.com | 2006-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | - make sure cluster/schema table is always created first | ||||
| * | | | | | ndb - bug#18295 | jonas@perch.ndb.mysql.com | 2006-03-24 | 3 | -15/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | rewrite/clean up code a bit to avoid a gcc4 compiler bug | ||||
* | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new | jonas@perch.ndb.mysql.com | 2006-03-24 | 8 | -28/+62 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/51-ndb | ||||
| * | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new | jonas@eel.(none) | 2006-03-15 | 8 | -28/+62 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/51-ndb | ||||
| | * \ \ \ \ | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new | jonas@eel.(none) | 2006-03-15 | 8 | -28/+62 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/51-ndb | ||||
| | | * | | | | | ndb test | jonas@eel.(none) | 2006-03-04 | 8 | -28/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add disk option to various bank tests | ||||
* | | | | | | | | ndb - merge fixes | jonas@perch.ndb.mysql.com | 2006-03-24 | 4 | -168/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-work | jonas@perch.ndb.mysql.com | 2006-03-24 | 30 | -317/+1133 |
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new | ||||
* | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new | tomas@poseidon.ndb.mysql.com | 2006-03-23 | 2 | -4/+19 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new | ||||
| * | | | | | | Bug #18472 race condition between multiple mysqld's when setting up ↵ | tomas@poseidon.ndb.mysql.com | 2006-03-23 | 2 | -4/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cluster/schema - check that event is the correct one, and only delete if wrong version | ||||
* | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new | pekka@mysql.com | 2006-03-23 | 8 | -19/+94 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | into mysql.com:/export/space/pekka/ndb/version/my51 | ||||
| * | | | | | | ndb - bug#17813 schema.query => blob | pekka@mysql.com | 2006-03-23 | 8 | -19/+94 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | ndb: added debug printout to track down a bug | tomas@poseidon.ndb.mysql.com | 2006-03-22 | 1 | -7/+18 |
| | | | | | | |||||
* | | | | | | ndb: removed TransporterFacade singleton | tomas@poseidon.ndb.mysql.com | 2006-03-22 | 13 | -82/+72 |
| | | | | | | |||||
* | | | | | | corrected previous patch | tomas@poseidon.ndb.mysql.com | 2006-03-22 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | added config parameter InitialNoOfOpenFiles | tomas@poseidon.ndb.mysql.com | 2006-03-22 | 2 | -2/+16 |
|/ / / / / | |||||
* | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new | tomas@poseidon.ndb.mysql.com | 2006-03-20 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new | ||||
| * | | | | | ndb: added debug printout | tomas@poseidon.ndb.mysql.com | 2006-03-20 | 1 | -0/+3 |
| |/ / / / |