summaryrefslogtreecommitdiff
path: root/storage
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-03-303-5/+6
|\ | | | | | | into mysql.com:/home/my/mysql-5.1
| * Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-newacurtis@xiphis.org2006-03-293-5/+6
| |\ | | | | | | | | | into xiphis.org:/home/antony/work2/p1-bug18464
| | * Bug#18464acurtis@xiphis.org2006-03-283-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.1monty@mysql.com2006-03-291-1/+2
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| * | | Safety fix to ensure that long event names always ends with \0monty@mysql.com2006-03-291-1/+2
| | | | | | | | | | | | | | | | This removes a warning about missing DBUG_ENTER while running tests
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-03-2913-5/+22
|\ \ \ \ | |/ / / | | / / | |/ / |/| | into mysql.com:/home/my/mysql-5.1
| * | Remove compiler warningsmonty@mysql.com2006-03-2912-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 warningsmonty@mysql.com2006-03-291-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-newpetr@mysql.com2006-03-292-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.com2006-03-292-27/+47
| | |
| * | WL#3154 "Enable REPAIR for CSV tables".petr@mysql.com2006-03-132-23/+361
| | | | | | | | | | | | | | | This is the first commit. Cleanups are likely to follow after the merge.
* | | some simple CMAKE updatesreggie@big_geek.2006-03-281-0/+5
| | |
* | | Merge bk-internal:/home/bk/mysql-5.1-newknielsen@mysql.com2006-03-281-1/+1
|\ \ \ | | | | | | | | | | | | into mysql.com:/usr/local/mysql/tmpbuild
| * | | ndb test: remove not needed setting causing compile errortomas@poseidon.ndb.mysql.com2006-03-281-1/+1
| | |/ | |/|
* | | Manual merge.knielsen@mysql.com2006-03-2811-12/+89
|\ \ \ | |/ / |/| |
| * | Add missing cmakelists.txt for archive.knielsen@mysql.com2006-03-241-0/+6
| | |
| * | Some changes to make it possible to build for Windows with CMake fromknielsen@mysql.com2006-03-248-5/+11
| | | | | | | | | | | | a normal 'make dist' source .tar.gz.
| * | Updated CMake stuff to handle the configurations needed for releaseknielsen@mysql.com2006-03-232-7/+72
| | | | | | | | | | | | builds.
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-03-275-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.com2006-03-275-14/+272
| | | | | | | | | | | | | | | | restart
* | | | ATRT documentationskozlov@mysql.com2006-03-272-0/+516
| | | |
* | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-newjonas@perch.ndb.mysql.com2006-03-274-12/+37
|\ \ \ \ | |/ / / |/| | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
| * | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-03-274-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-newmskold@mysql.com2006-03-247-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-newmskold@mysql.com2006-03-247-8/+68
| |\ \ \ | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
| | * | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0mskold@mysql.com2006-03-237-8/+68
| | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
* | | | | ndb autotestjonas@perch.ndb.mysql.com2006-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | fix \ in makefile (merge error)
* | | | | ndb - bug#18295jonas@perch.ndb.mysql.com2006-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | more work-arounds for gcc4
* | | | | ndb -jonas@perch.ndb.mysql.com2006-03-241-0/+3
| | | | | | | | | | | | | | | | | | | | more compiler warnings...
* | | | | ndb - jonas@perch.ndb.mysql.com2006-03-243-7/+31
| | | | | | | | | | | | | | | | | | | | still some compiler warnings
* | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-ndbjonas@perch.ndb.mysql.com2006-03-244-16/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
| * \ \ \ \ Merge ndbdev@ndbmaster.mysql.com:jonas/mysql-5.1-newjonas@perch.ndb.mysql.com2006-03-241-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
| | * | | | - corrected bug causing hang in getTable when using blob tablestomas@poseidon.ndb.mysql.com2006-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - make sure cluster/schema table is always created first
| * | | | | ndb - bug#18295jonas@perch.ndb.mysql.com2006-03-243-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-newjonas@perch.ndb.mysql.com2006-03-248-28/+62
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/51-ndb
| * | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-newjonas@eel.(none)2006-03-158-28/+62
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/51-ndb
| | * \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-newjonas@eel.(none)2006-03-158-28/+62
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/51-ndb
| | | * | | | | ndb testjonas@eel.(none)2006-03-048-28/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add disk option to various bank tests
* | | | | | | | ndb - merge fixesjonas@perch.ndb.mysql.com2006-03-244-168/+3
| | | | | | | |
* | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-03-2430-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-newtomas@poseidon.ndb.mysql.com2006-03-232-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.com2006-03-232-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-newpekka@mysql.com2006-03-238-19/+94
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | into mysql.com:/export/space/pekka/ndb/version/my51
| * | | | | | ndb - bug#17813 schema.query => blobpekka@mysql.com2006-03-238-19/+94
| | |_|_|/ / | |/| | | |
* | | | | | ndb: added debug printout to track down a bugtomas@poseidon.ndb.mysql.com2006-03-221-7/+18
| | | | | |
* | | | | | ndb: removed TransporterFacade singletontomas@poseidon.ndb.mysql.com2006-03-2213-82/+72
| | | | | |
* | | | | | corrected previous patchtomas@poseidon.ndb.mysql.com2006-03-222-2/+2
| | | | | |
* | | | | | added config parameter InitialNoOfOpenFilestomas@poseidon.ndb.mysql.com2006-03-222-2/+16
|/ / / / /
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-03-201-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
| * | | | | ndb: added debug printouttomas@poseidon.ndb.mysql.com2006-03-201-0/+3
| |/ / / /