database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Code Activity
Files
eca724f45c0ec272bed53eed94616bc723391d0e
mariadb/sql
History
unknown eca724f45c Add macro for retrieving sec part of "struct timespec" 
Use macros for working with "struct timespec" in event_queue.cc
Fix merge problem


include/my_pthread.h:
  Remove merge problem causing "struct timespec" to be declared twice
  Add macro "get_timespec_sec" used for retrieving the time in seconds
sql/event_queue.cc:
  Use macros for working with "struct timespec"
sql/log_event.cc:
  Add casts from "byte*" to "char*"
2006-12-15 10:41:24 +01:00
..
examples
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
2006-10-16 17:39:38 +10:00
share
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-12-04 19:11:55 +01:00
.cvsignore
…
add_errmsg
…
authors.h
errmsg.txt:
2006-09-07 13:52:30 +10:00
client_settings.h
…
CMakeLists.txt
Refactoring: Moved master info functionality into rpl_mi.cc to
2006-10-31 16:51:51 +01:00
contributors.h
Added new show contributors command.
2006-05-02 17:53:26 -07:00
custom_conf.h
…
derror.cc
…
des_key_file.cc
…
discover.cc
sql/Makefile.am: better mysqld dependencies
2006-05-30 18:21:03 +02:00
event_data_objects.cc
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
event_data_objects.h
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
event_db_repository.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
event_db_repository.h
WL#3337 (Event scheduler new architecture)
2006-08-28 10:27:42 +02:00
event_queue.cc
Add macro for retrieving sec part of "struct timespec"
2006-12-15 10:41:24 +01:00
event_queue.h
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +02:00
event_scheduler.cc
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
event_scheduler.h
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +02:00
events.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
events.h
Fix for bug#22662 Inconsistent values displayed for event_scheduler
2006-09-25 17:22:23 +02:00
field_conv.cc
Merge 192.168.0.5:mysql/mysql-5.1-maint
2006-11-29 23:53:07 +01:00
field.cc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
2006-12-01 13:02:54 +01:00
field.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-30 23:27:16 +02:00
filesort.cc
Merge bk-internal:/home/bk/mysql-5.1
2006-11-28 17:14:16 +01:00
frm_crypt.cc
…
gen_lex_hash.cc
Fixed compiler warnings
2006-11-30 21:56:03 +02:00
gstream.cc
…
gstream.h
…
ha_ndbcluster_binlog.cc
Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema
2006-12-01 15:49:07 +01:00
ha_ndbcluster_binlog.h
Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema
2006-12-01 15:49:07 +01:00
ha_ndbcluster_tables.h
Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema
2006-12-01 15:49:07 +01:00
ha_ndbcluster.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-12-04 19:11:55 +01:00
ha_ndbcluster.h
bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated
2006-11-30 23:10:11 +01:00
ha_partition.cc
Removed compiler warnings
2006-11-27 18:16:08 +02:00
ha_partition.h
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
handler.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-12-04 19:28:38 +01:00
handler.h
Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location.
2006-11-19 18:01:54 -08:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
…
init.cc
…
item_buff.cc
Bug#22138: Unhandled NULL caused server crash
2006-10-11 19:44:12 +04:00
item_cmpfunc.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-29 23:36:26 +03:00
item_cmpfunc.h
Merge mysql.com:/home/hf/work/mysql-5.0.clean
2006-11-08 19:09:39 +04:00
item_create.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-12-04 19:11:55 +01:00
item_create.h
Bug#21114 (Foreign key creation fails to table with name format)
2006-11-02 11:01:53 -07:00
item_func.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-12-04 19:28:38 +01:00
item_func.h
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-12-04 19:28:38 +01:00
item_geofunc.cc
Fix for the failing gis.test
2006-08-18 22:29:35 +05:00
item_geofunc.h
Bug#21114 (Foreign key creation fails to table with name format)
2006-11-02 11:01:53 -07:00
item_row.cc
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
2006-08-30 03:00:19 +04:00
item_row.h
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
item_strfunc.cc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
2006-12-01 13:02:54 +01:00
item_strfunc.h
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
2006-11-16 10:06:36 -07:00
item_subselect.cc
Merge bk-internal:/home/bk/mysql-5.1
2006-11-28 17:14:16 +01:00
item_subselect.h
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
2006-11-29 11:48:44 +01:00
item_sum.cc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
2006-12-01 13:02:54 +01:00
item_sum.h
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
2006-11-29 11:48:44 +01:00
item_timefunc.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-12-04 19:28:38 +01:00
item_timefunc.h
Merge bk@192.168.21.1:mysql-5.0-opt
2006-11-17 10:30:16 +04:00
item_uniq.cc
…
item_uniq.h
…
item_xmlfunc.cc
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
item_xmlfunc.h
BUG#18198
2006-09-26 02:25:23 -04:00
item.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-12-04 19:28:38 +01:00
item.h
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
2006-11-29 11:48:44 +01:00
key.cc
Added --debug-info to most clients to detect memory leaks in mysql-test-run
2006-11-21 22:32:58 +02:00
lex_symbol.h
Bug#21114 (Foreign key creation fails to table with name format)
2006-11-02 11:01:53 -07:00
lex.h
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
2006-11-07 16:24:35 +03:00
lock.cc
Fix for Bug #17544 "Cannot do atomic log rotate",
2006-10-13 17:26:46 +04:00
log_event.cc
Add macro for retrieving sec part of "struct timespec"
2006-12-15 10:41:24 +01:00
log_event.h
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
log.cc
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-01 21:12:13 +01:00
log.h
Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2006-12-01 11:35:05 +08:00
Makefile.am
Merge mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-29 14:35:59 +01:00
matherr.c
…
message.mc
make dist changes for Cmake build
2006-09-01 10:32:12 +02:00
mf_iocache.cc
…
my_decimal.cc
Merge mysql.com:/home/hf/work/mysql-5.0.clean
2006-11-08 19:09:39 +04:00
my_decimal.h
Merge mysql.com:/home/hf/work/mysql-5.0.clean
2006-11-08 19:09:39 +04:00
my_lock.c
…
mysql_priv.h
Merge bk-internal:/home/bk/mysql-5.1-maint
2006-12-05 10:54:17 +01:00
mysqld_suffix.h
…
mysqld.cc
Use "sql_print_error" instead of "sql_print_warning" to get a better
2006-12-05 12:11:45 +01:00
mysqld.cc.rej
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-16 14:38:45 +02:00
net_serv.cc
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Merge polly.local:/tmp/maint/bug24261/my51-bug24261
2006-12-08 23:47:49 +03:00
opt_range.h
Fix for bug #23762: partition.test fails (partition_hash, partition_pruning as well)
2006-11-02 17:11:53 +04:00
opt_sum.cc
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
2006-10-18 18:51:39 +10:00
parse_file.cc
Bug#21370: View renaming lacks tablename_to_filename encoding
2006-10-16 22:42:03 +05:00
parse_file.h
Removed compiler warnings
2006-11-27 18:16:08 +02:00
partition_element.h
This is a cleanup of warnings that windows is complaining about.
2006-08-23 15:12:42 -07:00
partition_info.cc
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
partition_info.h
BUG#18198: Partition function handling
2006-10-02 15:52:29 -04:00
password.c
Fixed portability issue in my_thr_init.c (was added in my last push)
2006-11-30 18:25:05 +02:00
procedure.cc
…
procedure.h
String::set(double) and set(longlong) -> set_real() and set_int()
2006-06-16 12:17:20 +02:00
protocol.cc
Merge mysql.com:/home/hf/work/mysql-5.0-mrg
2006-11-17 18:27:28 +04:00
protocol.h
Merge mysql.com:/home/hf/work/mysql-4.1-mrg
2006-11-16 23:16:44 +04:00
records.cc
Merge mysql.com:/home/hf/work/mysql-5.0.clean
2006-11-08 19:09:39 +04:00
repl_failsafe.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
repl_failsafe.h
…
rpl_filter.cc
Fixes for Windows compilation failures.
2006-07-07 16:14:07 +04:00
rpl_filter.h
Fixes for Windows compilation failures.
2006-07-07 16:14:07 +04:00
rpl_injector.cc
Fixing problem in injector code making NDB tests fire an assertion.
2006-11-13 15:42:01 +01:00
rpl_injector.h
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
rpl_mi.cc
Refactoring: Moved master info functionality into rpl_mi.cc to
2006-10-31 16:51:51 +01:00
rpl_mi.h
Refactoring: Moved master info functionality into rpl_mi.cc to
2006-10-31 16:51:51 +01:00
rpl_rli.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
rpl_rli.h
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-11-03 21:11:58 +01:00
rpl_tblmap.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
rpl_tblmap.h
…
rpl_utility.cc
Removed compiler warnings
2006-11-27 18:16:08 +02:00
rpl_utility.h
WL#3259 (RBR with more columns on slave than master):
2006-09-13 19:25:12 +02:00
set_var.cc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
2006-12-01 13:02:54 +01:00
set_var.h
WL#3337 (Event scheduler new architecture)
2006-09-01 13:08:44 +02:00
slave.cc
Fixed portability issue in my_thr_init.c (was added in my last push)
2006-11-30 18:25:05 +02:00
slave.h
Refactoring: Moved master info functionality into rpl_mi.cc to
2006-10-31 16:51:51 +01:00
sp_cache.cc
Fixed portability issue in my_thr_init.c (was added in my last push)
2006-11-30 18:25:05 +02:00
sp_cache.h
…
sp_head.cc
Fixed portability issue in my_thr_init.c (was added in my last push)
2006-11-30 18:25:05 +02:00
sp_head.h
Post-merge fixes.
2006-08-30 23:09:47 +04:00
sp_pcontext.cc
…
sp_pcontext.h
…
sp_rcontext.cc
Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
2006-08-02 22:18:49 -07:00
sp_rcontext.h
Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
2006-08-02 22:18:49 -07:00
sp.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-12-04 19:28:38 +01:00
sp.h
Bug#21039 Transaction cache not flushed after SELECT CREATE
2006-07-26 12:40:26 +02:00
spatial.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
spatial.h
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
sql_acl.cc
Fixed portability issue in my_thr_init.c (was added in my last push)
2006-11-30 18:25:05 +02:00
sql_acl.h
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
2006-05-11 11:28:56 +04:00
sql_analyse.cc
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
2006-09-28 14:33:39 -04:00
sql_analyse.h
String::set(double) and set(longlong) -> set_real() and set_int()
2006-06-16 12:17:20 +02:00
sql_array.h
…
sql_base.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-12-04 19:28:38 +01:00
sql_binlog.cc
Removed compiler warnings
2006-11-27 18:16:08 +02:00
sql_bitmap.h
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
sql_builtin.cc.in
…
sql_cache.cc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
2006-12-01 13:02:54 +01:00
sql_cache.h
BUG#21051: RESET QUERY CACHE very slow when query_cache_type=0
2006-08-22 11:47:52 +04:00
sql_class.cc
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
2006-12-05 10:32:16 -05:00
sql_class.h
Merge bk-internal:/home/bk/mysql-5.1-maint
2006-12-05 10:54:17 +01:00
sql_client.cc
…
sql_crypt.cc
unsigned char -> uchar
2006-06-19 12:45:34 +03:00
sql_crypt.h
…
sql_cursor.cc
Merge fix.
2006-09-30 19:08:13 -07:00
sql_cursor.h
…
sql_db.cc
Fixed portability issue in my_thr_init.c (was added in my last push)
2006-11-30 18:25:05 +02:00
sql_delete.cc
Fixed portability issue in my_thr_init.c (was added in my last push)
2006-11-30 18:25:05 +02:00
sql_derived.cc
…
sql_do.cc
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
sql_error.cc
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
2006-08-30 03:00:19 +04:00
sql_error.h
Cleanup patch.
2006-08-17 18:13:45 +02:00
sql_handler.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-12-04 19:28:38 +01:00
sql_help.cc
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
sql_insert.cc
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
sql_lex.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-12-04 19:11:55 +01:00
sql_lex.h
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-12-04 19:11:55 +01:00
sql_list.cc
…
sql_list.h
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02:00
sql_load.cc
BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.
2006-10-06 13:34:07 +04:00
sql_locale.cc
Fix compile errors in VC++ 7.0
2006-08-21 16:21:48 +04:00
sql_manager.cc
Removed bdb test cases.
2006-08-10 18:29:25 -07:00
sql_map.cc
…
sql_map.h
…
sql_olap.cc
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
sql_parse.cc
Merge naruto.:C:/cpp/bug17489/my50-bug17489
2006-12-10 17:01:27 +01:00
sql_parse.cc.rej
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
2006-10-17 19:54:44 +03:00
sql_partition.cc
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
sql_partition.h
Merge dator5.(none):/home/pappa/clean-mysql-5.1
2006-10-16 15:40:40 -04:00
sql_plugin.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-30 23:27:16 +02:00
sql_plugin.h
converting plugin states to bitmask to simplify testing.
2006-09-06 10:22:59 +02:00
sql_prepare.cc
Fixed portability issue in my_thr_init.c (was added in my last push)
2006-11-30 18:25:05 +02:00
sql_rename.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-30 22:38:12 +02:00
sql_repl.cc
Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2006-12-01 11:35:05 +08:00
sql_repl.h
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-28 14:09:31 +05:00
sql_select.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-30 22:38:12 +02:00
sql_select.h
Merge mysql.com:/home/hf/work/mysql-5.0.clean
2006-11-08 19:09:39 +04:00
sql_show.cc
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-01 21:12:13 +01:00
sql_show.h
bug #21495 Alter table from x engine to ndb and back can cause issue with drop DB:disable distributed drop database if a database contains local tables
2006-11-15 11:13:49 +01:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Merge mysql.com:/usr/home/bar/mysql-5.0.b18908
2006-11-01 16:48:03 +04:00
sql_string.h
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
2006-11-29 11:48:44 +01:00
sql_table.cc
Additional fix for bug#22369
2006-12-07 13:57:39 +01:00
sql_tablespace.cc
This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
2006-09-30 12:49:46 -07:00
sql_test.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
sql_trigger.cc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
2006-12-01 13:02:54 +01:00
sql_trigger.h
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20670-2
2006-09-29 18:26:30 +04:00
sql_udf.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-08-12 21:06:51 +04:00
sql_udf.h
Fix compiler warnings in sql_udf.h: ISO C++ forbids casting
2006-07-09 13:03:51 +04:00
sql_union.cc
Fixed compiler warnings (Mostly VC++):
2006-11-30 03:40:42 +02:00
sql_update.cc
Fixed portability issue in my_thr_init.c (was added in my last push)
2006-11-30 18:25:05 +02:00
sql_view.cc
Fixed portability issue in my_thr_init.c (was added in my last push)
2006-11-30 18:25:05 +02:00
sql_view.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
2006-10-13 08:57:15 -04:00
sql_yacc.yy
Additional fix for bug#22369
2006-12-07 13:57:39 +01:00
stacktrace.c
Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint
2006-10-20 14:32:31 +04:00
stacktrace.h
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx
2006-09-07 00:59:08 +02:00
strfunc.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
structs.h
WL#3146 "less locking in auto_increment":
2006-07-09 17:52:19 +02:00
table.cc
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-01 21:12:13 +01:00
table.cc.rej
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
2006-10-17 19:54:44 +03:00
table.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-29 22:54:11 +02:00
thr_malloc.cc
…
time.cc
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-10 15:05:38 +03:00
tzfile.h
…
tztime.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-30 22:38:12 +02:00
tztime.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-05-02 18:41:42 -04:00
udf_example.c
Fix netware compile failure
2006-11-23 20:07:53 +01:00
udf_example.def
Add the two new functions to udf_example.def so they will be exported by dll's
2006-11-16 16:19:29 +01:00
uniques.cc
Fixed compiler warnings
2006-11-30 21:56:03 +02:00
unireg.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
unireg.h
Merge sunlight.local:/local_work/leak_fix_orig
2006-08-09 02:49:29 +04:00