hartmut@mysql.com/hartmut-desktop.buero.foebud.org
4c9f4a006f
added missing prototype implementations (bug #25933 )
2007-03-15 13:35:49 +01:00
jonas@perch.ndb.mysql.com
1bf8202fce
ndb - bug#27169
...
Fix bug in SUMA::resend_bucket which could cause mysqld to crash
2007-03-15 13:30:42 +01:00
holyfoot/hf@hfmain.(none)
6767673750
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-15 16:22:32 +04:00
jonas@perch.ndb.mysql.com
f8483eccc3
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-15 11:06:57 +01:00
jonas@perch.ndb.mysql.com
1c203fcc04
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-03-15 11:06:01 +01:00
dlenev@mockturtle.local
d9d887ad6d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg25966
2007-03-15 11:00:54 +03:00
jonas@perch.ndb.mysql.com
14de245543
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-15 07:16:44 +01:00
jonas@perch.ndb.mysql.com
1fa2a64778
ndb -
...
fix test_event -n EventOperationApplier
2007-03-15 07:08:15 +01:00
jonas@perch.ndb.mysql.com
a7714519a7
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
2007-03-14 15:41:24 +01:00
jonas@perch.ndb.mysql.com
72bd367013
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-14 15:40:06 +01:00
jonas@perch.ndb.mysql.com
3b21f00f87
ndb - bug#27005
...
Handle API failure during resend
API failure could cause release of table object, which will make resend crash
when dereferencing table object
Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend
2007-03-14 15:37:47 +01:00
kent@kent-amd64.(none)
ac91a4a89f
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-14 14:37:50 +01:00
kent@kent-amd64.(none)
52ef6aa5ed
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-14 14:32:30 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
1bcac85f04
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2007-03-14 18:48:51 +08:00
jonas@perch.ndb.mysql.com
f2465cf677
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-14 11:23:58 +01:00
jonas@perch.ndb.mysql.com
820901f928
ndb - bug#27087
...
Make sure not to handle API_FAILREQ if it's already handled
2007-03-14 11:22:11 +01:00
istruewing@blade08.mysql.com
b6a66ee829
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25460
2007-03-14 11:20:06 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
9b77ac20a5
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-03-14 10:16:24 +08:00
svoj@april.(none)
94f0977b86
Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
2007-03-14 04:48:43 +04:00
jonas@perch.ndb.mysql.com
ac52f24ece
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-13 21:04:28 +01:00
jonas@perch.ndb.mysql.com
5ea42fb2ea
ndb - bug#27102
...
Make sure head after undo execute does not point to last page of file
As this will confuse next write to group
2007-03-13 21:03:34 +01:00
istruewing@blade08.mysql.com
d3b7fce8cf
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25460
2007-03-13 17:55:04 +01:00
istruewing@chilla.local
67d97254b0
Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
...
The previous two patches for this bug worked together so that
no permanent table was memory mapped. The first patch tried to
avoid mapping while a table is in use. It allowed mapping only
if there was exactly one lock on the table, assuming that the
calling thread owned it. During mi_open(), a different call to
memory mapping was coded, which did not have this limitation.
The second patch tried to remove the code duplication and just
called mi_extra() from mi_open() an thus inherited the limitation.
But on open, a thread does not have a lock on the table...
A possible solution would be to check for zero or one lock.
But since I learned that it is safe to memory map a file while
normal file I/O is done on it, I removed the restriction altogether
and allow to memory map while a table is in use.
No test case. I do not see a chance to verify with the test suite
which kind of I/O is used on a table.
2007-03-13 16:43:45 +01:00
svoj@april.(none)
31329c83c0
Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
2007-03-13 19:05:35 +04:00
svoj@april.(none)
dfc078fc50
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
2007-03-13 17:08:11 +04:00
jonas@perch.ndb.mysql.com
023ce289b6
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-13 13:56:51 +01:00
jonas@perch.ndb.mysql.com
4a27e9adb9
ndb - bug#27003
...
merge to 5.1, adopt testprg to optimized node recovery
2007-03-13 12:38:47 +01:00
jonas@perch.ndb.mysql.com
620731060f
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-03-13 12:07:33 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
8b049838bf
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb.test
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.test
2007-03-13 18:18:17 +08:00
lzhou/zhl@dev3-63.(none)
9fb5e5d08b
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug26307
2007-03-13 10:13:04 +00:00
knielsen@ymer.(none)
4fe26832e4
Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb
...
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-03-12 08:42:59 +01:00
xxx/istruewing@blade08.mysql.com
1781a96fc5
Merge bk://localhost:5556
...
into blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25673
2007-03-09 19:52:14 +01:00
istruewing@chilla.local
3e608ee1f0
Merge chilla.local:/home/mydev/mysql-5.0-bug25673
...
into chilla.local:/home/mydev/mysql-5.1-bug25673
2007-03-09 19:50:49 +01:00
gkodinov/kgeorge@magare.gmz
c03a483c51
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
2007-03-09 17:54:13 +02:00
tomas@poseidon.mysql.com
175a7e9e86
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 20:44:44 +07:00
tomas@poseidon.mysql.com
6f5ac3c03a
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-09 20:38:10 +07:00
tomas@poseidon.mysql.com
a8cd78dd05
Bug #26825 MySQL Server Crashes in high load
...
Bug #26997 mysqld segfault when in single user mode
2007-03-09 20:29:46 +07:00
tomas@poseidon.mysql.com
87b8cf843e
Merge poseidon.mysql.com:/home/tomas/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-09 18:18:52 +07:00
tomas@poseidon.mysql.com
7e32a4b86b
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 18:10:55 +07:00
jonas@perch.ndb.mysql.com
5a6952b8c5
Merge perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.0-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca
2007-03-09 11:50:32 +01:00
kroki/tomash@moonlight.home
7bbea96754
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug9953
2007-03-09 13:17:46 +03:00
kroki/tomash@moonlight.home
c19affef54
BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked
...
The problem was that some facilities (like CONVERT_TZ() function or
server HELP statement) may require implicit access to some tables in
'mysql' database. This access was done by ordinary means of adding
such tables to the list of tables the query is going to open.
However, if we issued LOCK TABLES before that, we would get "table
was not locked" error trying to open such implicit tables.
The solution is to treat certain tables as MySQL system tables, like
we already do for mysql.proc. Such tables may be opened for reading
at any moment regardless of any locks in effect. The cost of this is
that system table may be locked for writing only together with other
system tables, it is disallowed to lock system tables for writing and
have any other lock on any other table.
After this patch the following tables are treated as MySQL system
tables:
mysql.help_category
mysql.help_keyword
mysql.help_relation
mysql.help_topic
mysql.proc (it already was)
mysql.time_zone
mysql.time_zone_leap_second
mysql.time_zone_name
mysql.time_zone_transition
mysql.time_zone_transition_type
These tables are now opened with open_system_tables_for_read() and
closed with close_system_tables(), or one table may be opened with
open_system_table_for_update() and closed with close_thread_tables()
(the latter is used for mysql.proc table, which is updated as part of
normal MySQL server operation). These functions may be used when
some tables were opened and locked already.
NOTE: online update of time zone tables is not possible during
replication, because there's no time zone cache flush neither on LOCK
TABLES, nor on FLUSH TABLES, so the master may serve stale time zone
data from cache, while on slave updated data will be loaded from the
time zone tables.
2007-03-09 13:12:31 +03:00
gni/root@dev3-221.dev.cn.tlan
afd6dbbc57
Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug25992
2007-03-09 18:04:34 +08:00
xxx/istruewing@blade08.mysql.com
0ba036f783
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25673
2007-03-09 10:08:39 +01:00
tomas@poseidon.mysql.com
451a8b7772
BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), ndbd nodes are crashed
2007-03-09 10:21:11 +07:00
istruewing@chilla.local
651b7b7fc1
Merge chilla.local:/home/mydev/mysql-5.0-bug25673
...
into chilla.local:/home/mydev/mysql-5.1-bug25673
2007-03-08 21:29:19 +01:00
tomas@poseidon.mysql.com
f4e0bc78dd
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-09 01:01:20 +07:00
tomas@poseidon.mysql.com
1d13b0e2e8
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-09 00:49:30 +07:00
tsmith@bk-internal.mysql.com
8539d9a7bd
The most recent push into mysql-5.1 from mysql-5.2 was a mistake.
...
This just reverses those changes. I'm really sorry about that.
configure.in, version.c:
Reverse last push (from mysql-5.2 into mysql-5.1)
2007-03-08 18:38:17 +01:00
tsmith@bk-internal.mysql.com
bb273143fc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2
2007-03-08 17:55:20 +01:00