unknown 3ee4e5f2ec Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new ... into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new sql/field.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged		2006-04-06 11:25:29 +02:00
..
share	Merge mysql.com:/usr/home/bar/mysql-5.0	2006-04-05 19:00:02 +05:00
.cvsignore
add_errmsg
authors.h	Andrei Elkin has arrived.	2006-04-01 14:17:01 +03:00
client_settings.h
cmakelists.txt	Add embedded server build to the CMake build files.	2006-04-03 10:25:36 +02:00
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
event.h	fix for bug 16408 (Events: crash for an event in a procedure)	2006-03-16 13:14:40 +01:00
event_executor.cc	save the modified value and compare it every time. the memory address	2006-03-01 04:22:05 +01:00
event_priv.h	class event_timed -> Event_timed	2006-02-28 18:33:38 +01:00
event_timed.cc	manual merge	2006-03-17 09:40:48 +01:00
field.cc	Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new	2006-04-03 13:27:12 +02:00
field.h	Manually merged	2006-04-05 20:12:26 +04:00
field_conv.cc	Re commit of previous fix as the bk tree was broken.	2006-03-14 17:46:25 +02:00
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_archive.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
ha_archive.h	This patch adds a new field to the meta file for tracking flushes (this is being kept to later do stats and determine how often the compression buffer is being foiled). This should keep things all nice an compatible between versions.	2006-02-15 00:59:24 -08:00
ha_berkeley.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
ha_berkeley.h
ha_blackhole.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
ha_blackhole.h
ha_federated.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
ha_federated.h	merged	2006-03-06 23:20:19 +01:00
ha_heap.cc	Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0	2006-04-01 02:57:56 -08:00
ha_heap.h
ha_innodb.cc	Applied innodb-5.0-ss398 snapshot.	2006-04-01 01:54:15 +04:00
ha_innodb.h	Applied innodb-5.1-ss269 snapshot.	2006-03-10 19:22:21 +03:00
ha_myisam.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
ha_myisam.h
ha_myisammrg.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
ha_myisammrg.h
ha_ndbcluster.cc	Merge mysql.com:/opt/local/work/tmp_merge	2006-03-30 18:43:42 +04:00
ha_ndbcluster.h	Bug #18596 binlog schema event auto push causes mysqld errors	2006-04-03 19:11:20 +02:00
ha_ndbcluster_binlog.cc	Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new	2006-04-06 11:25:29 +02:00
ha_ndbcluster_binlog.h	Bug #18472 race condition between multiple mysqld's when setting up cluster/schema	2006-03-23 22:49:02 +01:00
ha_ndbcluster_tables.h	Bug #17805 Cluster_replication database should be renamed to just cluster	2006-03-01 13:31:21 +01:00
ha_partition.cc	Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new	2006-03-31 11:42:12 -06:00
ha_partition.h	BUG # 17631 SHOW TABLE STATUS reports wrong engine	2006-03-31 01:02:44 -06:00
handler.cc	Merge mysql.com:/home/bkroot/mysql-5.1-new	2006-03-31 13:34:30 +02:00
handler.h	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
handlerton-win.cc	restored handlerton-win.cc that I mistakenly deleted.	2006-03-28 09:05:23 -06:00
handlerton.cc.in
hash_filo.cc
hash_filo.h
hostname.cc	Merge mysql.com:/usr/home/ram/work/mysql-4.1	2006-03-03 15:32:00 +04:00
init.cc
item.cc	Merge	2006-04-04 23:37:44 +02:00
item.h	Merge mysql.com:/home/timka/mysql/src/5.0-tmp-merge	2006-04-04 14:35:17 +03:00
item_buff.cc
item_cmpfunc.cc	Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0	2006-04-03 21:04:38 -07:00
item_cmpfunc.h	Post review changes for the fix of bug #16504.	2006-04-03 21:02:40 -07:00
item_create.cc	Fixes to the replication mixed mode (patch approved by Monty):	2006-03-13 15:34:30 +01:00
item_create.h
item_func.cc	Remove compiler warnings	2006-03-29 17:04:00 +03:00
item_func.h	Fixed bug#13575: SP funcs in select with distinct/group and order by can	2006-03-10 13:53:00 +03:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc	Remove compiler warnings	2006-03-29 17:04:00 +03:00
item_strfunc.h	Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8	2006-03-06 12:52:38 +04:00
item_subselect.cc
item_subselect.h	Fix bug #15706 find_field_in_tables() returns field from outer select	2006-02-15 19:45:06 +03:00
item_sum.cc	Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0	2006-04-01 02:57:56 -08:00
item_sum.h	item_sum.cc, sql_select.cc:	2006-03-30 19:04:21 +04:00
item_timefunc.cc	Remove unused variable	2006-03-28 19:34:44 +02:00
item_timefunc.h
item_uniq.cc
item_uniq.h
item_xmlfunc.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
item_xmlfunc.h
key.cc	Remove unused variable	2006-03-28 19:34:44 +02:00
lex.h	BUG#17754	2006-03-20 14:36:21 -05:00
lex_symbol.h
lock.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
log.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new	2006-03-29 17:28:40 +03:00
log.h	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
log_event.cc	Bug#18436 (RBR: Replication to partition engine triggers assertion on slave):	2006-03-27 14:58:37 +02:00
log_event.h	WL#3023 (Use locks in a statement-like manner):	2006-03-08 21:49:49 +01:00
Makefile.am	Manual merge.	2006-03-28 10:07:03 +02:00
matherr.c
message.mc	Some changes to make it possible to build for Windows with CMake from	2006-03-24 22:50:56 +01:00
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h	Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0	2006-04-01 02:57:56 -08:00
mysqld.cc	Add embedded server build to the CMake build files.	2006-04-03 10:25:36 +02:00
mysqld_suffix.h
net_serv.cc	Make the define start at "start of line"	2006-03-02 10:55:55 +01:00
nt_servc.cc
nt_servc.h
opt_range.cc	Merge mysql.com:/home/timka/mysql/src/5.0-tmp-merge	2006-04-04 14:35:17 +03:00
opt_range.h
opt_sum.cc	Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0	2006-04-05 14:00:54 -07:00
parse_file.cc	Merge zim.(none):/home/ian/workspace/mysql-5.0	2006-03-27 19:48:44 -08:00
parse_file.h	Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created	2006-03-28 01:01:51 +04:00
partition_element.h	Fix for bug#15447 Partitions: NULL is treated as zero	2006-03-07 15:25:08 +04:00
partition_info.cc	cleaned up a few method comments	2006-03-31 11:39:44 -06:00
partition_info.h	cleaned up a few method comments	2006-03-31 11:39:44 -06:00
password.c	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
procedure.cc
procedure.h
protocol.cc	Fixes to embedded server to be able to run tests with it	2006-02-24 18:34:15 +02:00
protocol.h	Fixes to embedded server to be able to run tests with it	2006-02-24 18:34:15 +02:00
records.cc
repl_failsafe.cc
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new	2006-03-11 07:26:58 +01:00
rpl_injector.h	wl#3023 clean up	2006-03-11 15:52:38 +01:00
rpl_rli.h	WL#3023 (Use locks in a statement-like manner):	2006-02-16 08:30:53 +01:00
rpl_tblmap.cc
rpl_tblmap.h
set_var.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
set_var.h	WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement),	2006-02-25 22:21:03 +01:00
slave.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
slave.h
sp.cc	Merge mysql.com:/opt/local/work/tmp_merge2	2006-03-30 19:12:10 +04:00
sp.h
sp_cache.cc	Remove unused variable	2006-03-28 19:34:44 +02:00
sp_cache.h
sp_head.cc	Remove compiler warnings	2006-03-29 17:04:00 +03:00
sp_head.h	Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree	2006-03-09 20:41:21 +03:00
sp_pcontext.cc	Fixed BUG#16887: Cursor causes server segfault	2006-02-15 12:11:29 +01:00
sp_pcontext.h	Fixed BUG#16887: Cursor causes server segfault	2006-02-15 12:11:29 +01:00
sp_rcontext.cc
sp_rcontext.h	Fixed compiler warnings from gcc 4.0.2:	2006-02-25 17:46:30 +02:00
spatial.cc
spatial.h	Fixed compiler warnings from gcc 4.0.2:	2006-02-25 17:46:30 +02:00
sql_acl.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
sql_acl.h
sql_analyse.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
sql_analyse.h
sql_array.h
sql_base.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new	2006-03-29 17:28:40 +03:00
sql_binlog.cc	fixed BINLOG crashes in case of badly formed statement (Bug #17457)	2006-03-01 12:45:13 +02:00
sql_bitmap.h
sql_cache.cc
sql_cache.h	Fixed compiler warnings from gcc 4.0.2:	2006-02-25 17:46:30 +02:00
sql_class.cc	Refactored some code to remove ifdef and removed dead code related to un-useable sync code.	2006-03-23 05:51:31 -08:00
sql_class.h	Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0	2006-04-01 02:57:56 -08:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc	Fixes to embedded server to be able to run tests with it	2006-02-24 18:34:15 +02:00
sql_cursor.h
sql_db.cc	Merge shellback.(none):/home/msvensson/mysql/mysql-5.0	2006-03-01 15:49:50 +01:00
sql_delete.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
sql_derived.cc
sql_do.cc
sql_error.cc	Merge shellback.(none):/home/msvensson/mysql/mysql-5.0	2006-03-23 18:14:02 +01:00
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc	Merge mysql.com:/opt/local/work/tmp_merge2	2006-03-30 19:12:10 +04:00
sql_lex.cc	Fixes to the replication mixed mode (patch approved by Monty):	2006-03-13 15:34:30 +01:00
sql_lex.h	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new	2006-03-20 14:41:50 -05:00
sql_list.cc
sql_list.h
sql_load.cc	Merge mysql.com:/opt/local/work/tmp_merge2	2006-03-30 19:12:10 +04:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
sql_partition.cc	BUG#18659: In get_part_iter_for_interval_via_walking(), when we need to	2006-04-04 00:52:14 +04:00
sql_partition.h	Bug#18053 Partitions: crash if null	2006-03-28 17:25:19 +05:00
sql_plugin.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
sql_plugin.h
sql_prepare.cc	Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0	2006-03-29 17:54:01 -08:00
sql_rename.cc	Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525	2006-02-27 20:00:07 +03:00
sql_repl.cc	Refactored some code to remove ifdef and removed dead code related to un-useable sync code.	2006-03-23 05:51:31 -08:00
sql_repl.h
sql_select.cc	Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0	2006-04-03 21:04:38 -07:00
sql_select.h	Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525	2006-02-27 20:00:07 +03:00
sql_show.cc	use show_table instead of share	2006-03-31 22:03:13 -06:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc	Merge mysql.com:/usr/home/bar/mysql-4.1.b15376	2006-03-23 12:41:28 +04:00
sql_string.h
sql_table.cc	Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0	2006-04-01 02:57:56 -08:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc	Merge zim.(none):/home/ian/workspace/mysql-5.0	2006-03-27 19:48:44 -08:00
sql_trigger.h	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime	2006-02-26 16:38:48 +03:00
sql_udf.cc	Bug#11835 CREATE FUNCTION crashes server	2006-03-21 10:54:26 +01:00
sql_udf.h
sql_union.cc
sql_update.cc	Manually merged	2006-04-05 20:12:26 +04:00
sql_view.cc	Merge mysql.com:/opt/local/work/tmp_merge2	2006-03-30 19:12:10 +04:00
sql_view.h
sql_yacc.yy	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
table.h	Bug#18280 (RBR: Extreneous maps when writing to general_log and slow_log):	2006-03-17 18:11:07 +01:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
tztime.h	Merge mysql.com:/home/my/mysql-5.0	2006-02-25 21:54:34 +02:00
udf_example.cc	Fix 'metaphon' function to correctly calculate the length of the returned string	2006-03-24 11:12:32 +01:00
uniques.cc
unireg.cc	bug 17290 and bug 14350	2006-03-18 18:48:21 +04:00
unireg.h
watchdog_mysqld