unknown 7589de6c10 Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0 ... into mysql.com:/home/hartmut/projects/mysql/dev/5.1 mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/information_schema.test: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/opt_sum.cc: Auto merged		2006-04-07 11:23:55 +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
event_priv.h
event_timed.cc	manual merge	2006-03-17 09:40:48 +01:00
field.cc	Merge mysql.com:/usr/home/bar/mysql-5.0.1.2107.1.1	2006-03-31 17:38:00 +05: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
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	Bug #18596 binlog schema event auto push causes mysqld errors	2006-04-03 19:11:20 +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
item_sum.cc	Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0	2006-04-07 11:23:55 +02:00
item_sum.h	item_sum.cc, sql_select.cc:	2006-03-30 19:04:21 +04:00
item_timefunc.cc	Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0	2006-04-07 11:23:55 +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 spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new	2006-04-06 21:26:23 +04:00
opt_range.h
opt_sum.cc	Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0	2006-04-07 11:23:55 +02: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	BUG#18558 "Partition pruning results are incorrect for certain class of WHERE clauses" :	2006-04-06 21:23:33 +04:00
password.c	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
procedure.cc
procedure.h
protocol.cc
protocol.h
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
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
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
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
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
sql_bitmap.h
sql_cache.cc
sql_cache.h
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
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	Merge april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0	2006-04-06 16:44:26 +05: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	Merge april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0	2006-04-06 16:44:26 +05:00
sql_partition.cc	BUG#18558 "Partition pruning results are incorrect for certain class of WHERE clauses" :	2006-04-06 21:23:33 +04:00
sql_partition.h	BUG#18558 "Partition pruning results are incorrect for certain class of WHERE clauses" :	2006-04-06 21:23:33 +04: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
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
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
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
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