Commit graph

586 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
263276c581 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-09 09:35:20 +02:00
jonas@perch.ndb.mysql.com
50e5752e27 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-08 16:35:07 +02:00
jonas@perch.ndb.mysql.com
965d6ac6bf Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-08 16:33:59 +02:00
jonas@perch.ndb.mysql.com
64c8342f40 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-08 11:12:02 +02:00
jonas@perch.ndb.mysql.com
452a2fb1bf Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-07 12:56:25 +02:00
jonas@perch.ndb.mysql.com
878ce564f4 Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-07 12:01:09 +02:00
serg@serg.mylan
216fb55743 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-07 10:30:34 +02:00
serg@serg.mylan
ec61fe292a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-06 22:28:45 +02:00
knielsen@mysql.com
534a87dda2 Remove no longer needed generation of dummy ib_config.h 2006-04-06 17:03:01 +02:00
jonas@perch.ndb.mysql.com
327adcf461 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-06 16:25:19 +02:00
serg@serg.mylan
cc3c065aa9 Bug#18836 - fulltext parser plugin is called recursively.
Don't use the same param in recursive call.
Also, the fix makes it safe for a plugin to replace param->mysql_add_word
2006-04-06 16:03:04 +02:00
jonas@perch.ndb.mysql.com
1617e5cb25 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-06 13:18:13 +02:00
msvensson@shellback.(none)
e1348410d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-04-06 11:38:50 +02:00
stewart@mysql.com
ef4c0d8042 Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new-bug18831
2006-04-06 17:24:02 +10:00
stewart@mysql.com
c7f3ce1148 BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump test
don't know why this didn't generate a warning, but let's fix it too.
2006-04-06 17:13:17 +10:00
stewart@mysql.com
f54a2ff55b BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump test 2006-04-06 17:02:56 +10:00
igor@rurik.mysql.com
679dbc7627 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-04 04:35:16 -07:00
tomas@poseidon.ndb.mysql.com
7cd8c8428a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-04 11:48:28 +02:00
msvensson@shellback.(none)
abc72552b5 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/bug17368/my51-bug17368
2006-04-04 10:00:27 +02:00
msvensson@shellback.(none)
67bcb953aa Bug#17368 General log and slow query log don't work
- Port ha_tina.cc to run on windows
2006-04-04 09:59:19 +02:00
igor@rurik.mysql.com
d6af1b6e39 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-01 02:57:56 -08:00
kent@mysql.com
ac34c93bc2 Merge 2006-03-30 23:52:54 +02:00
kent@mysql.com
ece5ef1551 Merge 2006-03-30 22:10:48 +02:00
konstantin@mysql.com
5c99b8b83f Merge mysql.com:/opt/local/work/tmp_merge
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 18:43:42 +04:00
monty@mysql.com
2b1f521286 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-30 06:11:34 +03:00
acurtis@xiphis.org
6cbd57914a Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  xiphis.org:/home/antony/work2/p1-bug18464
2006-03-29 17:31:59 -08:00
monty@mysql.com
0e27cbeadc Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-03-29 23:01:35 +03:00
monty@mysql.com
8b21a9d46a Safety fix to ensure that long event names always ends with \0
This removes a warning about missing DBUG_ENTER while running tests
2006-03-29 22:58:34 +03:00
monty@mysql.com
c3e7c7aa4b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-29 17:28:40 +03:00
monty@mysql.com
cbd420a0c1 Remove compiler warnings
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()
2006-03-29 17:04:00 +03:00
monty@mysql.com
1994ed49ec Fixed compiler and valgrind warnings
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
2006-03-29 14:27:36 +03:00
petr@mysql.com
14346aa9a4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 06:34:12 +04:00
petr@mysql.com
39a251f35b Post-review fixes for WL#3154 "Enable REPAIR for CSV tables" 2006-03-29 06:28:57 +04:00
acurtis@xiphis.org
f6febdb95a Bug#18464
"Can't make example storage engine available"
Build was attempting a shared-lib build instead of static
2006-03-28 14:34:28 -08:00
reggie@big_geek.
4a166c2f2f some simple CMAKE updates 2006-03-28 10:05:25 -06:00
knielsen@mysql.com
4c87c8dc54 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild
2006-03-28 16:35:50 +02:00
tomas@poseidon.ndb.mysql.com
49ef07fb9d ndb test: remove not needed setting causing compile error 2006-03-28 11:51:22 +02:00
knielsen@mysql.com
cc57e4e01b Manual merge. 2006-03-28 10:07:03 +02:00
tomas@poseidon.ndb.mysql.com
6ad5038423 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-27 19:03:22 +02:00
tomas@poseidon.ndb.mysql.com
e8423ff093 Bug #18491 cluster: node restart with pending dropeed events causes failed restart 2006-03-27 18:53:23 +02:00
skozlov@mysql.com
8cf57c5520 ATRT documentation 2006-03-27 14:59:19 +04:00
jonas@perch.ndb.mysql.com
582d3fed7a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-27 10:29:36 +02:00
jonas@perch.ndb.mysql.com
cb6b9ee73e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-27 10:26:37 +02:00
knielsen@mysql.com
c05590707d Add missing cmakelists.txt for archive. 2006-03-24 23:19:59 +01:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01:00
mskold@mysql.com
1c6f8158f2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-24 13:28:29 +01:00
jonas@perch.ndb.mysql.com
038287aa9d ndb autotest
fix \ in makefile (merge error)
2006-03-24 12:36:39 +01:00
jonas@perch.ndb.mysql.com
b3ee3a81a5 ndb - bug#18295
more work-arounds for gcc4
2006-03-24 11:35:57 +01:00
mskold@mysql.com
a444f0a3ae Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-24 10:48:28 +01:00
jonas@perch.ndb.mysql.com
4a22082b66 ndb -
more compiler warnings...
2006-03-24 10:23:50 +01:00