Commit graph

33784 commits

Author SHA1 Message Date
ingo@mysql.com
83bd32079d Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-06 09:49:16 +02:00
monty@mysql.com
9c132f3b6b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-05-05 20:09:20 +03:00
monty@mysql.com
8c7783c1e0 Don't use row level logging on optimize or repair table.
(Fixes core dump in rpl_failed_optimize.test)
Ensure we end active transcations if we do an admin command (like optimize, repair etc)
2006-05-05 20:08:40 +03:00
jmiller@mysql.com
9d1f5003c1 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-05 16:54:24 +02:00
tomas@poseidon.ndb.mysql.com
f8c37502b3 do not install ndb slave if no slaves
fixed memleak in ndbcluster_end
2006-05-05 15:34:46 +02:00
monty@mysql.com
69d0960d60 Fixed wrong merge 2006-05-05 13:10:42 +03:00
monty@mysql.com
3ecf4de288 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-05-05 11:38:05 +03:00
ingo@mysql.com
9d9637ea51 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-05 09:42:20 +02:00
monty@mysql.com
3e5d75c4e3 After merge fix 2006-05-05 04:52:32 +03:00
tomas@poseidon.ndb.mysql.com
135f4ab706 ndb: fix compile error 2006-05-05 00:59:27 +02:00
tomas@poseidon.ndb.mysql.com
a9993f11ef ndb: added missing ifdef 2006-05-05 00:33:12 +02:00
tomas@poseidon.ndb.mysql.com
f814a2184a ndb disabled test case against verified bug 2006-05-05 00:06:44 +02:00
tomas@poseidon.ndb.mysql.com
831031ec02 disable test case since it causes failure in ndb_lock occationally, bug report referenced 2006-05-04 23:35:37 +02:00
tomas@poseidon.ndb.mysql.com
44acdaac39 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 23:22:54 +02:00
tomas@poseidon.ndb.mysql.com
f6ede396c0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 21:55:12 +02:00
monty@mysql.com
a9b83df104 After merge fix 2006-05-04 22:30:01 +03:00
monty@mysql.com
7f3c895332 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-05-04 22:27:12 +03:00
monty@mysql.com
34785c5c82 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-05-04 22:20:40 +03:00
monty@mysql.com
9e460e7a25 Fixed wrong free in sql_view.cc
mysql-test-run now fails in case of warnings
2006-05-04 22:19:31 +03:00
tomas@poseidon.ndb.mysql.com
a54c863366 Merge jonas@perch:/home/jonas/src/51-work
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 21:02:36 +02:00
acurtis@xiphis.org
1a5c828cf2 Bug#19536
"NDB replication fails when no explicit--binlog-format given"
  fix initialization, storage engine initialization must occur after
  logging type is configured
2006-05-04 10:26:10 -07:00
monty@mysql.com
c10f37673c Fixed compiler warnings
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
Fixed some memory leaks
2006-05-04 19:39:47 +03:00
tomas@poseidon.ndb.mysql.com
f67be8de63 ndb: now no difference in behaviour between row and statement based 2006-05-04 18:26:36 +02:00
jonas@perch.ndb.mysql.com
851132fb50 ndb dd -
fix buglet when nr-delete-op gets page fault
2006-05-04 18:22:16 +02:00
monty@mysql.com
ae83d6826d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-04 19:18:26 +03:00
monty@mysql.com
e71ad86cc1 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-04 17:19:43 +03:00
monty@mysql.com
3f2e2664a9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-04 17:12:47 +03:00
monty@mysql.com
c33b326d86 Fixed an (unlikely) memory leak 2006-05-04 17:11:40 +03:00
monty@mysql.com
770f03ef02 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-04 17:08:42 +03:00
jani@ua141d10.elisa.omakaista.fi
634afcc9f8 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-05-04 17:07:04 +03:00
jani@ua141d10.elisa.omakaista.fi
3e1e98876a Added test case for Bug#18712: Truncation problem. The test
is only to make sure that this will not be fixed, as it is
intended behaviour. Documentation will be improved accordingly.
2006-05-04 17:05:21 +03:00
jonas@perch.ndb.mysql.com
bdb13878d3 ndb dd -
Fix bug where page is read, modified and then transaction abort
  and then puge is flushed causing lsn on page to be 0
2006-05-04 16:01:37 +02:00
jonas@perch.ndb.mysql.com
0764e94dad ndb dd - Impl. support for using delayed page request, to simulate "full" page buffer cache 2006-05-04 15:58:15 +02:00
tomas@poseidon.ndb.mysql.com
7fe2ab3f2c ndb:
stilled small memleak
+ changed clear/init indexes code a litter
2006-05-04 15:55:38 +02:00
monty@mysql.com
3ddc1f9956 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-05-04 15:58:30 +03:00
monty@mysql.com
1809adee63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-04 15:32:25 +03:00
monty@mysql.com
837ba4f399 Fixed memory leak in sql_parse.cc (lex_end() was not called)
This caused sp-vars.test to fail
2006-05-04 15:30:38 +03:00
tomas@poseidon.ndb.mysql.com
37e8b5ac06 removing the usage if the ndb local dict cache to adress the 241 errors we get now and then 2006-05-04 13:58:17 +02:00
igor@rurik.mysql.com
da7108d40b Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-05-04 04:55:32 -07:00
svoj@april.(none)
dee1baaefd Fixed heap_btree test failure on 64-bit boxes. 2006-05-04 15:52:09 +05:00
ingo@mysql.com
1d72bf877d Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-04 10:22:48 +02:00
holyfoot@mysql.com
d5c6f594de Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-04 10:13:34 +05:00
holyfoot@mysql.com
540481aef9 Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-04 09:59:32 +05:00
holyfoot@deer.(none)
2f154ab410 test result fixed 2006-05-04 09:58:03 +05:00
igor@rurik.mysql.com
dd839667c7 Post-review changes. 2006-05-03 21:35:27 -07:00
monty@mysql.com
86b2be8d35 After merge fixes
Remove compiler warnings
Fix some broken tests
Workaround for syncronization bug in NDB (Bug #16445)
2006-05-04 06:28:24 +03:00
igor@rurik.mysql.com
3dc06cb3fa Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-05-03 19:38:37 -07:00
monty@mysql.com
8f6ed291a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-05-04 01:58:21 +03:00
mikael@zim.(none)
d98fe8b724 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug19313
2006-05-03 15:58:20 -07:00
kent@mysql.com
55ccf0fe87 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-04 00:58:19 +02:00