Commit graph

607 commits

Author SHA1 Message Date
pekka@mysql.com
4d1e38744d ndb - bug#16796 2006-04-17 20:24:41 +02:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
brian@zim.(none)
ba2502b9c3 Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
serg@serg.mylan
3acc678101 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-13 15:34:39 +02:00
tomas@poseidon.ndb.mysql.com
07753c59a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-13 10:48:24 +02:00
serg@serg.mylan
601d707661 Auto merged 2006-04-12 14:14:03 +02:00
serg@serg.mylan
70c2ff34f7 fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00
marty@linux.site
7696f11b6c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/marty/MySQL/mysql-5.1-new
2006-04-11 21:06:48 +02:00
marty@linux.site
473d0ae7da Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/marty/MySQL/mysql-5.1-new
2006-04-11 14:21:01 +02:00
marty@linux.site
a03d5ad9f2 Added --p for producing output parsable by LOAD TABLE INFILE 2006-04-11 14:09:04 +02:00
msvensson@neptunus.(none)
9d2fd3b3ca Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already. 2006-04-11 12:38:21 +02:00
msvensson@shellback.
afaa4e2be5 Merge 192.168.0.10:mysql/mysql-5.1
into  shellback.:C:/mysql/my51-bug17368
2006-04-11 12:19:28 +02:00
msvensson@shellback.
a68d2e3aa1 Close share->data_file in before renaming in ha_tina::repair
Open and seek to end of data_file after rename 
Fix comment for when file does not need repair.
Set share->mapped_file to NULL always when it's been unmapped 
Add test to see that file can be used after repair
2006-04-11 12:12:48 +02:00
kent@mysql.com
8476262472 Merge 2006-04-11 02:48:17 +02:00
jonas@perch.ndb.mysql.com
b1f9980d88 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-10 17:54:43 +02:00
jonas@perch.ndb.mysql.com
e82605bcb1 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-10 17:07:32 +02:00
jonas@perch.ndb.mysql.com
d3b1572acf ndb -
fix all valgrind warnings in t/ndb_dd (except replication related)
2006-04-10 17:06:33 +02:00
jonas@perch.ndb.mysql.com
f897c0cebd ndb -
still some valgrind varnings
2006-04-10 14:14:28 +02:00
jonas@perch.ndb.mysql.com
e0f3118ab9 ndb - bug#17607
5.0->5.1 merge
2006-04-10 14:02:13 +02:00
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
kent@mysql.com
f957d8e282 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-04-08 04:29:17 +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