database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
Files
ddea504a7d69d76de6da243d71b507df91d05593
mariadb/sql
History
Jon Olav Hauglid ddea504a7d Bug #48541 Deadlock between LOCK_open and LOCK_mdl 
The reason for the deadlock was an improper exit from
MDL_context::wait_for_locks() which caused mysys_var->current_mutex to remain
LOCK_mdl even though LOCK_mdl was no longer held by that connection. 

This could for example lead to a deadlock in the following way:
1) INSERT DELAYED tries to open a table but fails, and trying to recover it
calls wait_for_locks().
2) Due to a pending exclusive request, wait_for_locks() fails and exits without
resetting mysys_var->current_mutex for the delayed insert handler thread. So it
continues to point to LOCK_mdl.
3) The handler thread manages to open a table.
4) A different connection takes LOCK_open and tries to take LOCK_mdl.
5) FLUSH TABLES from a third connection notices that the handler thread has a
table open, and tries to kill it. This involves locking mysys_var->current_mutex
while having LOCK_open locked. Since current_mutex mistakenly points to LOCK_mdl,
we have a deadlock.

This patch makes sure MDL_EXIT_COND() is called before exiting wait_for_locks().
This clears mysys->current_mutex which resolves the issue. 

An assert is added to recover_from_failed_open_table_attempt() after
wait_for_locks() is called, to check that current_mutex is indeed reset.
With this assert in place, existing tests in (e.g.) mdl_sync.test will fail
without this patch.
2009-12-16 12:32:11 +01:00
..
examples
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-17 15:54:01 +02:00
share
Backport of:
2009-12-09 18:48:42 +03:00
.cvsignore
…
add_errmsg
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
authors.h
manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2009-10-22 23:30:28 +01:00
client_settings.h
Backport of WL#798 (MySQL IPv6 support) from 6.0.
2009-11-25 13:53:23 +03:00
CMakeLists.txt
Backport of:
2009-12-03 21:37:38 +03:00
contributors.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
custom_conf.h
…
debug_sync.cc
backport of dbug extensions from 6.0:
2009-10-30 19:13:58 +01:00
debug_sync.h
WL#4259 - Debug Sync Facility
2009-09-29 17:38:40 +02:00
derror.cc
Backport of:
2009-11-24 16:54:59 +03:00
des_key_file.cc
Backport of:
2009-11-24 16:54:59 +03:00
discover.cc
Backport of:
2009-11-24 16:54:59 +03:00
event_data_objects.cc
Manual merge of mysql-next-mr-runtime upstream.
2009-11-19 21:48:08 -02:00
event_data_objects.h
…
event_db_repository.cc
Backport of:
2009-12-08 12:57:07 +03:00
event_db_repository.h
…
event_parse_data.cc
Bug#29125 Windows Server X64: so many compiler warnings
2009-02-13 11:41:47 -05:00
event_parse_data.h
Added "Sun Microsystems, Inc." to copyright headers on files modified
2008-11-10 21:21:49 +01:00
event_queue.cc
…
event_queue.h
…
event_scheduler.cc
Bug#32115: Bad use of Name_resolution_context from current LEX in partitioning
2009-11-20 00:13:54 +01:00
event_scheduler.h
…
events.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
events.h
…
field_conv.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-17 15:54:01 +02:00
field.cc
Backport of:
2009-11-24 16:54:59 +03:00
field.h
Backport of:
2009-12-02 18:22:15 +03:00
filesort.cc
Backport of:
2009-11-24 16:54:59 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
Bug#29125 Windows Server X64: so many compiler warnings
2009-02-13 11:41:47 -05:00
gstream.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-09 18:11:21 +02:00
gstream.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
ha_ndbcluster_binlog.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
ha_ndbcluster_binlog.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
ha_ndbcluster_cond.cc
…
ha_ndbcluster_cond.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
ha_ndbcluster_tables.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
ha_ndbcluster.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
ha_ndbcluster.h
manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2009-10-22 23:30:28 +01:00
ha_partition.cc
Backport of:
2009-12-03 02:09:22 +03:00
ha_partition.h
Backport of:
2009-11-30 22:38:25 +03:00
handler.cc
Backport of:
2009-12-03 21:37:38 +03:00
handler.h
Merge next-mr -> next-4284.
2009-12-15 22:03:56 +03:00
hash_filo.cc
…
hash_filo.h
Backport of:
2009-10-14 20:37:38 +04:00
hostname.cc
Backport of WL#798 (MySQL IPv6 support) from 6.0.
2009-11-25 13:53:23 +03:00
init.cc
Backport of:
2009-11-24 16:54:59 +03:00
item_buff.cc
…
item_cmpfunc.cc
Auto-merged fix for the bug#34384.
2009-12-01 22:41:39 +03:00
item_cmpfunc.h
Manual merge from mysql-next-mr.
2009-12-02 18:50:14 +03:00
item_create.cc
Merge
2009-11-03 12:37:02 +01:00
item_create.h
…
item_func.cc
Merge next-mr -> next-4284
2009-12-16 10:48:07 +03:00
item_func.h
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw
2009-11-30 14:34:39 +02:00
item_geofunc.cc
automerge
2009-10-24 09:57:31 +03:00
item_geofunc.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
item_row.cc
…
item_row.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
item_strfunc.cc
Backport of:
2009-11-24 16:54:59 +03:00
item_strfunc.h
manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2009-10-22 23:30:28 +01:00
item_subselect.cc
Auto-merged fix for the bug#34384.
2009-12-01 22:41:39 +03:00
item_subselect.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
item_sum.cc
merging.
2009-11-17 15:24:23 +04:00
item_sum.h
merging.
2009-11-17 15:24:23 +04:00
item_timefunc.cc
Manual merge of mysql-next-mr-runtime upstream.
2009-11-19 21:48:08 -02:00
item_timefunc.h
Merge to latest mysql-next-mr
2009-11-02 11:09:15 +01:00
item_xmlfunc.cc
Bug#34384: Slow down on constant conversion.
2009-11-06 22:34:25 +03:00
item_xmlfunc.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
item.cc
Bug#33546: Slowdown on re-evaluation of constant expressions.
2009-12-02 00:25:51 +03:00
item.h
Manual merge from mysql-next-mr.
2009-12-02 18:50:14 +03:00
key.cc
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
lex_symbol.h
…
lex.h
Backport of:
2009-12-10 11:21:38 +03:00
lock.cc
Merge with next-4284.
2009-12-11 13:39:45 +03:00
log_event_old.cc
Backport of:
2009-12-08 12:57:07 +03:00
log_event_old.h
…
log_event.cc
Backport of:
2009-12-08 12:57:07 +03:00
log_event.h
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
2009-11-06 18:35:04 +02:00
log.cc
Backport of:
2009-12-08 12:57:07 +03:00
log.h
BUG#40611: MySQL cannot make a binary log after sequential number
2009-11-22 03:59:48 +00:00
Makefile.am
Backport of:
2009-12-03 21:37:38 +03:00
mdl.cc
Bug #48541 Deadlock between LOCK_open and LOCK_mdl
2009-12-16 12:32:11 +01:00
mdl.h
Backport of:
2009-12-10 11:21:38 +03:00
message.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
message.mc
…
message.rc
…
mf_iocache.cc
…
MSG00001.bin
…
my_decimal.cc
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
my_decimal.h
Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields when using IF
2009-11-02 09:21:39 -02:00
my_lock.c
…
mysql_priv.h
Merge next-mr -> next-4284.
2009-12-15 22:59:07 +03:00
mysql_priv.h.pp
Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clash
2009-10-06 13:04:51 +02:00
mysqld_suffix.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
mysqld.cc
Merge next-mr -> next-4284.
2009-12-15 22:59:07 +03:00
net_serv.cc
Manual merge from mysql-next-mr.
2009-11-02 14:10:04 +03:00
nt_servc.cc
merge
2008-11-22 01:10:38 +01:00
nt_servc.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
opt_range.cc
Auto-merge from mysql-next-mr-alik.
2009-11-10 11:34:26 +03:00
opt_range.h
Backport of:
2009-11-24 16:54:59 +03:00
opt_sum.cc
Backport of Bug#15192 to mysql-next-mr
2009-11-10 18:31:28 -02:00
parse_file.cc
Bug#44834 strxnmov is expected to behave as you'd expect
2009-06-19 13:24:43 +05:00
parse_file.h
Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist(addon)
2009-04-13 18:09:10 +05:00
partition_element.h
Merge
2009-10-28 18:32:48 +01:00
partition_info.cc
BUG#49180, fixed MAXVALUE problem
2009-12-02 08:14:22 +01:00
partition_info.h
Merged WL#3352 into mysql-next-mr
2009-10-28 18:22:36 +01:00
password.c
Manual merge.
2009-06-01 16:00:38 +04:00
procedure.cc
…
procedure.h
Merge from mysql-next-mr.
2009-10-28 10:55:44 +03:00
protocol.cc
Bug #49130 Running mtr tests with valgrind and debug produces lots of warnings
2009-12-02 11:00:44 +01:00
protocol.h
Merge from mysql-next-mr.
2009-10-28 10:55:44 +03:00
records.cc
Backport of:
2009-11-24 16:54:59 +03:00
records.h
Manual merge from mysql-trunk-merge.
2009-11-06 19:13:33 +03:00
repl_failsafe.cc
Manual resolving for the following files
2009-12-01 21:07:18 +02:00
repl_failsafe.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
replication.h
WL#4903 Plugin Service API part I
2009-11-02 21:05:42 +01:00
rpl_constants.h
BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event
2008-12-29 17:04:10 +01:00
rpl_filter.cc
Backport of:
2009-10-14 20:37:38 +04:00
rpl_filter.h
…
rpl_handler.cc
Auto merge from 5.1-rep-semisync
2009-12-05 10:28:53 +08:00
rpl_handler.h
Backporting WL#4398 WL#1720
2009-09-26 12:49:49 +08:00
rpl_injector.cc
Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,
2009-12-05 02:02:48 +03:00
rpl_injector.h
Backport of:
2009-10-14 15:14:58 +04:00
rpl_mi.cc
BUG#48048: Deprecated constructs need removal in Betony
2009-11-04 12:28:20 +00:00
rpl_mi.h
BUG#48048: Deprecated constructs need removal in Betony
2009-11-04 12:28:20 +00:00
rpl_record_old.cc
…
rpl_record_old.h
…
rpl_record.cc
BUG#43789 different master/slave table defs cause crash: text/varchar null
2009-09-29 15:18:44 +01:00
rpl_record.h
BUG#43789 different master/slave table defs cause crash: text/varchar null
2009-09-29 15:18:44 +01:00
rpl_reporting.cc
BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind
2009-06-16 16:04:30 +01:00
rpl_reporting.h
BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind
2009-06-16 16:04:30 +01:00
rpl_rli.cc
Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,
2009-12-05 02:02:48 +03:00
rpl_rli.h
Merge next-mr -> next-4284
2009-12-03 14:37:42 +03:00
rpl_tblmap.cc
Backport of:
2009-10-14 20:37:38 +04:00
rpl_tblmap.h
Backport of:
2009-10-14 20:37:38 +04:00
rpl_utility.cc
…
rpl_utility.h
Bug#42977 RBR logs for rows with more than 250 column results in corrupt binlog
2009-03-25 12:53:56 +02:00
scheduler.cc
…
scheduler.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
set_var.cc
Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,
2009-12-05 02:02:48 +03:00
set_var.h
Manual resolving for the following files
2009-12-01 21:07:18 +02:00
slave.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
slave.h
Backport of:
2009-11-23 19:57:31 +03:00
sp_cache.cc
Backport of:
2009-10-14 20:37:38 +04:00
sp_cache.h
…
sp_head.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sp_head.h
Backport of:
2009-12-09 19:11:26 +03:00
sp_pcontext.cc
Backport of:
2009-11-24 16:54:59 +03:00
sp_pcontext.h
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
sp_rcontext.cc
Auto-merged fix for the bug#34384.
2009-12-01 22:41:39 +03:00
sp_rcontext.h
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
sp.cc
Merge next-mr -> next-4284.
2009-12-15 22:59:07 +03:00
sp.h
Backport of:
2009-12-09 19:11:26 +03:00
spatial.cc
Merge from 5.0 for 43414
2009-08-28 18:21:54 +02:00
spatial.h
Merge from 5.0-bugteam
2009-06-17 16:56:44 +02:00
sql_acl.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_acl.h
Merge from mysql-next-mr.
2009-10-28 10:55:44 +03:00
sql_analyse.cc
Merge from 5.0-bugteam
2009-06-17 16:56:44 +02:00
sql_analyse.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_array.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_base.cc
Bug #48541 Deadlock between LOCK_open and LOCK_mdl
2009-12-16 12:32:11 +01:00
sql_binlog.cc
Initial import of WL#3726 "DDL locking for all metadata objects".
2009-11-30 18:55:03 +03:00
sql_bitmap.h
…
sql_builtin.cc.in
…
sql_cache.cc
------------------------------------------------------------
2009-12-04 01:46:14 +03:00
sql_cache.h
Bug#38551 query cache can still consume [very little] cpu time even when it is off.
2009-10-29 12:19:36 +01:00
sql_class.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_class.h
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_client.cc
…
sql_connect.cc
Backport of WL#798 (MySQL IPv6 support) from 6.0.
2009-11-25 13:53:23 +03:00
sql_crypt.cc
Bug#44358 valgrind errors with decode() function
2009-04-23 12:43:42 +05:00
sql_crypt.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_cursor.cc
Backport of:
2009-12-01 17:39:03 +03:00
sql_cursor.h
…
sql_db.cc
Backport of:
2009-12-02 18:22:15 +03:00
sql_delete.cc
Backport of:
2009-12-11 15:24:23 +03:00
sql_derived.cc
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
sql_do.cc
Backport of:
2009-12-03 21:37:38 +03:00
sql_error.cc
Merge from mysql-next-mr.
2009-10-23 15:22:21 +04:00
sql_error.h
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
sql_handler.cc
Backport of revno: 2617.68.37
2009-12-10 14:26:00 +01:00
sql_help.cc
Backport of:
2009-12-08 12:57:07 +03:00
sql_insert.cc
Merge next-mr -> next-4284.
2009-12-15 22:03:56 +03:00
sql_lex.cc
Bug#49165 Remove unused/confusing code/comments in setup_conds()
2009-11-27 15:23:20 +01:00
sql_lex.h
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_list.cc
Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,
2009-10-22 00:02:06 +04:00
sql_list.h
Backport of Bug#15192 to mysql-next-mr
2009-11-10 18:31:28 -02:00
sql_load.cc
Merge next-mr -> next-4284
2009-12-03 14:37:42 +03:00
sql_locale.cc
Manual-merge from mysql-trunk-merge.
2009-11-06 12:52:45 +03:00
sql_manager.cc
Bug#38522: 5 seconds delay when closing application using embedded server
2008-12-04 19:41:53 +01:00
sql_map.cc
Backport of:
2009-11-24 16:54:59 +03:00
sql_map.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_olap.cc
…
sql_parse.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_partition.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_partition.h
Fixed a few bugs in hex string generation, in call to val_str for partition expressions, also made code reusable for DEFAULT handling to fix BUG#48464 by introducing function get_cs_converted_string_value, added partition_utf8 test case for UTF8 outputs
2009-11-02 14:49:26 +01:00
sql_plist.h
Backport of:
2009-12-04 02:52:05 +03:00
sql_plugin_services.h
WL#4903 Plugin Service API part I
2009-11-02 21:05:42 +01:00
sql_plugin.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_plugin.h
WL#4903 Plugin Service API part I
2009-11-02 21:05:42 +01:00
sql_prepare.cc
Backport of revno: 2617.71.1
2009-12-10 11:53:20 +01:00
sql_prepare.h
Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,
2009-10-22 00:02:06 +04:00
sql_profile.cc
Backport of:
2009-12-03 00:24:10 +03:00
sql_profile.h
Backport of:
2009-12-03 00:24:10 +03:00
sql_rename.cc
Backport of:
2009-12-01 22:13:01 +03:00
sql_repl.cc
Manual merge from mysql-next-mr.
2009-12-02 18:50:14 +03:00
sql_repl.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_select.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_select.h
Bug#33546: Slowdown on re-evaluation of constant expressions.
2009-12-02 00:25:51 +03:00
sql_servers.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_servers.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_show.cc
Merge next-mr -> next-4284.
2009-12-15 22:03:56 +03:00
sql_show.h
Added "Sun Microsystems, Inc." to copyright headers on files modified
2008-11-10 21:21:49 +01:00
sql_signal.cc
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
sql_signal.h
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
sql_sort.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_state.c
…
sql_string.cc
Backport of:
2009-11-24 16:54:59 +03:00
sql_string.h
Bug #33544 UDF_INIT member decimals initialized wrong with
2009-11-11 21:19:41 +01:00
sql_table.cc
Merge next-mr -> next-4284.
2009-12-15 22:59:07 +03:00
sql_tablespace.cc
BUG#37148 Most callers of mysql_bin_log.write ignore the return result
2009-11-21 12:28:01 +08:00
sql_test.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_trigger.cc
Backport of revno: 2617.71.1
2009-12-10 11:53:20 +01:00
sql_trigger.h
Backport of:
2009-12-08 17:13:12 +03:00
sql_udf.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_udf.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_union.cc
5.0-bugteam->5.1-bugteam merge
2009-05-15 12:11:07 +05:00
sql_update.cc
Backport of:
2009-12-08 12:57:07 +03:00
sql_view.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
sql_view.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_yacc.yy
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
strfunc.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-09-23 15:21:29 +02:00
structs.h
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw
2009-11-30 14:34:39 +02:00
table.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
table.h
Merge next-mr -> next-4284.
2009-12-15 22:03:56 +03:00
thr_malloc.cc
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
time.cc
Manual merge from mysql-trunk-merge.
2009-11-06 17:20:27 +03:00
transaction.cc
Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,
2009-12-05 02:02:48 +03:00
transaction.h
Backport of:
2009-12-03 21:37:38 +03:00
tzfile.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
tztime.cc
Merge next-mr -> next-4284.
2009-12-16 11:33:54 +03:00
tztime.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
udf_example.c
Backport of:
2009-11-24 16:54:59 +03:00
udf_example.def
…
uniques.cc
Backport of:
2009-11-24 16:54:59 +03:00
unireg.cc
Backport of:
2009-11-24 16:54:59 +03:00
unireg.h
Backport of:
2009-11-23 19:57:31 +03:00