Commit graph

35465 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
49c8863bbf Bug #19852 Restoring backup made from cluster with full data memory fails
- post merge fixes for 5.1
2006-06-27 13:12:34 +02:00
tomas@poseidon.ndb.mysql.com
044e73a829 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-27 11:30:21 +02:00
tomas@poseidon.ndb.mysql.com
18e008a1ba Bug #19852 Restoring backup made from cluster with full data memory fails
- correction of previous patch
2006-06-27 11:26:00 +02:00
tomas@poseidon.ndb.mysql.com
f923d6395d Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-27 11:22:42 +02:00
tomas@poseidon.ndb.mysql.com
95447f9d1a Bug #19852 Restoring backup made from cluster with full data memory fails
- make sure to allocate just enough pages in the fragments by using the actual
  row count from the backup, to avoid over allocation of pages to fragments, and
  thus avoid the bug
2006-06-27 10:02:58 +02:00
jonas@perch.ndb.mysql.com
4af95eb79c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-26 20:14:40 +02:00
knielsen@rt.int.sifira.dk
b6c587695b Merge mysql.com:/usr/local/mysql/mysql-5.1-pristine
into  mysql.com:/usr/local/mysql/tmp-5.1
2006-06-26 16:04:06 +02:00
knielsen@mysql.com
3ba774f1d7 BUG#20676: debug warnings about too many lock waiters cause test failure.
The 250 simultaneous events all accessing the same table caused the
events_stress test to fail due to debug warnings about too many table
waiters. Fixed by using three different tables.
2006-06-26 15:49:58 +02:00
knielsen@rt.int.sifira.dk
22285bb75a Merge mysql.com:/usr/local/mysql/mysql-5.1-bug20549
into  mysql.com:/usr/local/mysql/tmp-5.1
2006-06-26 11:26:24 +02:00
jonas@perch.ndb.mysql.com
50b8eb8538 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-26 10:02:03 +02:00
elliot@mysql.com
72e8a44d51 Post merge fix 2006-06-25 16:04:11 -04:00
elliot@mysql.com
bc2b96fee3 Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
2006-06-25 09:59:34 -04:00
kent@mysql.com
b6e89c2b1e .del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
Delete: scripts/make_win_src_distribution.sh
Makefile.am:
  Unix and Windows now shares source package
2006-06-25 10:25:00 +02:00
knielsen@mysql.com
b9b25ada28 BUG#20677: Sporadic failure of test case 'ndb_binlog_multi'.
Start test case with a dummy table create and drop. This ensures that
NDB event subscription is properly set up before the real test starts,
which otherwise could sometimes cause INSERT events to be lost.
2006-06-25 08:59:44 +02:00
knielsen@rt.int.sifira.dk
7491454f78 Merge mysql.com:/usr/local/mysql/tmp-5.0
into  mysql.com:/usr/local/mysql/tmp-5.1
2006-06-24 13:14:24 +02:00
knielsen@rt.int.sifira.dk
9e1b155e1c Merge bk-internal:/home/bk/mysql-5.1
into  mysql.com:/usr/local/mysql/tmp-5.1
2006-06-24 13:12:45 +02:00
knielsen@mysql.com
34cf139bd9 Fix race condition in test case wait_timeout.
Sometimes the helper connection (that is watching for the main connection
to time out) would itself time out first, causing the test to fail.
2006-06-24 13:11:09 +02:00
knielsen@mysql.com
f976f27a8f Build fixes for Windows, Solaris, HPUX, AIX. 2006-06-24 07:45:23 +02:00
knielsen@devsrv-b.mysql.com
2e08725994 Merge bk-internal:/home/bk/mysql-5.1
into  mysql.com:/data0/knielsen/tmp-5.1
2006-06-24 00:12:34 +02:00
elliot@mysql.com
a5181fdcde Post merge fix. 2006-06-23 17:59:24 -04:00
elliot@mysql.com
d4796d9df6 Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
2006-06-23 17:27:54 -04:00
knielsen@rt.int.sifira.dk
4966090d3f Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
into  mysql.com:/usr/local/mysql/tmp-5.1
2006-06-23 15:05:15 +02:00
knielsen@mysql.com
af9e69b512 Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622
into  mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
2006-06-23 14:59:40 +02:00
knielsen@mysql.com
98a5cdfe4c BUG#20622: Fix one-byte buffer overrun in IM directory string handling.
The problem was a call to convert_dirname() with a destination buffer
that did not have room for the trailing slash added by that function.
This could cause the instance manager to crash in some cases.
2006-06-23 14:50:02 +02:00
monty@hasky.mysql.fi
ebe57fc707 Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-23 11:01:00 +03:00
monty@mysql.com
059c45d016 Suppress memory leak from 'kill_server'
(Happens if main thread exists before kill_server thread, which is ok)
2006-06-23 10:46:16 +03:00
monty@mysql.com
7ec5a7ecc5 Fixed memory leak (found by rpl_row_inexist_tbl) 2006-06-23 10:35:45 +03:00
monty@hasky.mysql.fi
a4f6871dbc Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-23 03:36:16 +03:00
monty@mysql.com
fba475cc47 Fixed problem when compiling libmysqld (without replication)
This change allows us to use the stmt_binlog function in the code without ifdefs
(We should avoid having ifdefs in the .cc and .c files)
2006-06-23 03:21:12 +03:00
monty@hasky.mysql.fi
14e05051f1 Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-23 03:04:13 +03:00
monty@narttu.mysql.fi
a168d1396c Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-23 03:03:03 +03:00
monty@mysql.com
4697deb436 Remove compiler warnings
Fixed wrong table flags type in ndbcluster that caused previous commit to fail
2006-06-23 02:49:19 +03:00
monty@hasky.mysql.fi
9305db78f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-22 23:01:01 +03:00
monty@hasky.mysql.fi
2b55a2880e Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-22 22:59:47 +03:00
monty@mysql.com
649157954b Fixed failure with rpl_truncate_7ndb.test when using statement based replication.
is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
(Faster and easier to understand)
Allow cluster_binlogging also in mixed replication mode.
2006-06-22 22:44:21 +03:00
pekka@orca.ndb.mysql.com
7524881b50 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug14935
2006-06-22 21:22:46 +02:00
pekka@orca.ndb.mysql.com
09e8039aa4 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781
2006-06-22 19:48:04 +02:00
pekka@clam.ndb.mysql.com
ac622fee7f ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come)
have to push this to be able to push 5.0
2006-06-22 19:26:15 +02:00
knielsen@mysql.com
bd5f334bed BUG#20549: Fix missing memory initialization.
Some values were not initialized, causing Valgrind errors (and potential
random bugs):

 - NDB binlog thread thd->variables.pseudo_thread_id.
 - Table null bits.
 - Field bytes for columns with NULL values.
2006-06-22 16:42:50 +02:00
mats@romeo.(none)
1b6a017155 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/bk/fix-mysql-5.1
2006-06-22 15:26:08 +02:00
jonas@perch.ndb.mysql.com
92addc582b Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-22 13:53:59 +02:00
jonas@perch.ndb.mysql.com
ef892289cf fix result file for ndb_dd_ddl 2006-06-22 13:53:02 +02:00
mats@mysql.com
3b830e4b9f Patch to handle some bad situations resulting from the fix for BUG#19995. 2006-06-22 13:28:04 +02:00
joerg@trift2.
5eea972046 Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1 2006-06-22 12:22:52 +02:00
monty@hasky.mysql.fi
729ee03648 Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-22 12:37:49 +03:00
monty@mysql.com
b8ab496057 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-22 12:21:41 +03:00
jonas@perch.ndb.mysql.com
f618c9ed8f Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-22 10:52:45 +02:00
jonas@perch.ndb.mysql.com
dc75269965 ndb - bug#16341
create tablespace/logfile group should "back out changes"
2006-06-22 10:24:44 +02:00
rburnett@bk-internal.mysql.com
d9fb74e40e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-22 01:25:57 +02:00
mikael@dator5.(none)
9543cae6cf Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug19281
2006-06-21 19:25:56 -04:00