unknown 749091a9ec Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql ... into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql mysql-test/r/func_group.result: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/select.result: SCCS merged		2006-07-31 23:49:52 +04:00
..
share	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt	Add sql_locale.cc to cmake scripts.	2006-07-28 16:37:16 +04:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_scheduler.cc	manual merge	2006-06-20 17:14:36 +02:00
event_scheduler.h
event_timed.cc	After merge fixes.	2006-07-07 03:07:45 +04:00
event_timed.h	forgot to event_timed.h	2006-06-20 17:05:41 +02:00
events.cc	Another post-merge fix.	2006-07-07 13:49:43 +04:00
events.h
events_priv.h
field.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
field.h	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
field_conv.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-15 01:04:51 +04:00
filesort.cc	Added purecov comment for new, not executed code for my recent changeset	2006-06-28 14:03:08 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc
ha_berkeley.h
ha_federated.cc	After merge fixes.	2006-07-21 10:43:10 +02:00
ha_federated.h	Small fix to mysql-5.1-engines, from merge from BUG #19773	2006-07-10 11:57:29 -07:00
ha_heap.cc
ha_heap.h
ha_innodb.cc	Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge	2006-06-23 17:27:54 -04:00
ha_innodb.h
ha_myisam.cc	BUG#20389: Crash when using index scan in reverse order	2006-07-15 03:38:34 -04:00
ha_myisam.h
ha_myisammrg.cc	After merge fix	2006-07-24 10:53:26 +02:00
ha_myisammrg.h
ha_ndbcluster.cc	Post-merge fixes.	2006-07-14 02:07:37 +04:00
ha_ndbcluster.h	Merge dator5.(none):/home/pappa/clean-mysql-5.1	2006-07-01 00:19:23 -04:00
ha_ndbcluster_binlog.cc	Bug #20843 tests fails randomly with assertion in completeClusterFailed	2006-07-08 03:26:13 +02:00
ha_ndbcluster_binlog.h
ha_ndbcluster_tables.h
ha_partition.cc	Merge dator5.(none):/home/pappa/clean-mysql-5.1	2006-07-15 04:06:31 -04:00
ha_partition.h	Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt	2006-07-15 03:59:53 -04:00
handler.cc	fixes after merge. Updates to test's results.	2006-07-10 18:41:03 +02:00
handler.h	Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0	2006-07-24 10:05:17 +02:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item.h	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item_buff.cc
item_cmpfunc.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item_cmpfunc.h	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item_create.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +04:00
item_create.h	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +04:00
item_func.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item_func.h	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item_geofunc.cc
item_geofunc.h	Merge mysql.com:/home/mydev/mysql-4.1-bug14400	2006-07-05 11:20:10 +02:00
item_row.cc
item_row.h
item_strfunc.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item_strfunc.h	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item_subselect.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item_subselect.h	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item_sum.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
item_sum.h
item_timefunc.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +04:00
item_timefunc.h	Manually merged	2006-06-18 14:56:35 +04:00
item_uniq.cc
item_uniq.h
item_xmlfunc.cc	Post-merge fixes.	2006-07-14 02:07:37 +04:00
item_xmlfunc.h
key.cc	Bug#20086: Can't get data from key partitioned tables with VARCHAR key	2006-06-21 13:00:19 +05:00
lex.h
lex_symbol.h
lock.cc	Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge	2006-07-04 10:02:11 +02:00
log.cc	Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl	2006-07-11 12:17:19 +02:00
log.h	after merge fixes	2006-06-21 14:53:40 +05:00
log_event.cc	Post-merge fixes.	2006-07-13 17:34:49 +04:00
log_event.h	Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0	2006-07-03 11:35:58 -04:00
Makefile.am	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +04:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
mysqld.cc	Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge	2006-07-10 17:20:39 -04:00
mysqld_suffix.h
net_serv.cc	configure.in, net_serv.cc, compile-netware-END:	2006-06-17 00:30:02 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc	BUG20733: Bug in partition pruning with zerofill field	2006-07-20 05:28:16 -04:00
opt_range.h	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
opt_sum.cc	Merge mysql.com:/home/mydev/mysql-4.1-bug11824	2006-07-05 11:11:40 +02:00
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc	partition functions to pass create_info, not only max_rows	2006-06-27 22:19:27 +02:00
partition_info.h	partition functions to pass create_info, not only max_rows	2006-06-27 22:19:27 +02:00
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
records.cc
repl_failsafe.cc
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	Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2	2006-06-23 15:05:15 +02:00
rpl_injector.h	Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2	2006-06-23 15:05:15 +02:00
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h
set_var.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +04:00
set_var.h	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +04:00
slave.cc	Bug#20850 (Assert during slave shutdown in many rpl_* tests):	2006-07-07 18:31:00 +02:00
slave.h	A fix for Bug#19022 "Memory bug when switching db during trigger execution".	2006-06-28 23:47:45 +04:00
sp.cc	Bug#21039 Transaction cache not flushed after SELECT CREATE	2006-07-26 12:40:26 +02:00
sp.h	Bug#21039 Transaction cache not flushed after SELECT CREATE	2006-07-26 12:40:26 +02:00
sp_cache.cc
sp_cache.h
sp_head.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-15 01:04:51 +04:00
sp_head.h	Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl	2006-07-11 12:17:19 +02:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h	gcc 4.1 linux warning fixes backported from 5.0.	2006-06-28 16:28:29 +03:00
sql_acl.cc	Merge rama.(none):/home/jimw/my/tmp_merge	2006-07-28 15:51:48 -07:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +04:00
sql_cache.h
sql_class.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
sql_class.h	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
sql_client.cc
sql_crypt.cc	unsigned char -> uchar	2006-06-19 12:45:34 +03:00
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-13 11:43:52 +04:00
sql_delete.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +04:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc	Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge	2006-07-04 10:02:11 +02:00
sql_help.cc
sql_insert.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
sql_lex.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-15 01:04:51 +04:00
sql_lex.h	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +04:00
sql_list.cc
sql_list.h
sql_load.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2006-07-13 00:18:59 +04:00
sql_locale.cc	Fix yet another Windows build failure: "true" -> TRUE	2006-07-11 01:46:44 +04:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
sql_partition.cc	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1	2006-07-29 23:54:55 +04:00
sql_partition.h	partition functions to pass create_info, not only max_rows	2006-06-27 22:19:27 +02:00
sql_plugin.cc
sql_plugin.h
sql_prepare.cc	Merge rama.(none):/home/jimw/my/tmp_merge	2006-07-28 15:51:48 -07:00
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-31 23:49:52 +04:00
sql_select.h	gcc 4.1 linux warning fixes backported from 5.0.	2006-06-28 16:28:29 +03:00
sql_show.cc	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2006-06-19 13:00:36 +03:00
sql_string.h	Bug#19006: 4.0 valgrind problems (in test func_str)	2006-07-01 14:31:52 -04:00
sql_table.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2006-07-26 21:48:45 +04:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-13 11:43:52 +04:00
sql_trigger.h	After merge fixes for patch solving bug#18437 "Wrong values inserted with a	2006-07-06 13:33:23 +04:00
sql_udf.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +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	BUG#17138: Crashes in stored procedure	2006-07-01 00:01:37 -04:00
sql_update.cc	Merge bodhi.local:/opt/local/work/tmp_merge	2006-07-26 23:33:25 +04:00
sql_view.cc	Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl	2006-07-11 12:17:19 +02:00
sql_view.h
sql_yacc.yy	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h	WL#3146 "less locking in auto_increment":	2006-07-09 17:52:19 +02:00
table.cc	Merge rama.(none):/home/jimw/my/tmp_merge	2006-07-28 15:51:48 -07:00
table.h	Merge rama.(none):/home/jimw/my/tmp_merge	2006-07-28 15:51:48 -07:00
thr_malloc.cc
time.cc	Bug#20729: Bad date_format() call makes mysql server crash	2006-07-11 13:06:29 -04:00
tzfile.h
tztime.cc	Merge bodhi.netgear:/opt/local/work/tmp_merge	2006-07-06 22:55:48 +04:00
tztime.h
udf_example.cc
uniques.cc
unireg.cc	Merge bk-internal:/home/bk/mysql-5.1	2006-07-19 08:57:52 +02:00
unireg.h