unknown d165736b8d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint ... into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint mysql-test/r/func_time.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/func_time.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_string.cc: Auto merged strings/strtod.c: Auto merged client/mysql.cc: Manual merge. mysql-test/r/ctype_utf8.result: Manual merge.		2006-09-28 07:30:24 -04:00
..
examples
share	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0	2006-09-18 16:23:45 +05:00
.cvsignore
add_errmsg
client_settings.h
CMakeLists.txt	Fix for bug #19121: Windows incompatible udf_example	2006-09-22 14:42:43 +02:00
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc
field.h
field_conv.cc
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_archive.cc
ha_archive.h
ha_berkeley.cc
ha_berkeley.h
ha_blackhole.cc
ha_blackhole.h
ha_federated.cc
ha_federated.h
ha_heap.cc
ha_heap.h
ha_innodb.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	2006-09-23 09:48:43 -04:00
ha_innodb.h
ha_myisam.cc
ha_myisam.h
ha_myisammrg.cc
ha_myisammrg.h
ha_ndbcluster.cc	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0	2006-09-18 16:23:45 +05:00
ha_ndbcluster.h
handler.cc
handler.h
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc
item.h	Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt	2006-09-15 14:14:38 +02:00
item_buff.cc
item_cmpfunc.cc	merge fixes	2006-09-18 12:14:27 +02:00
item_cmpfunc.h
item_create.cc
item_create.h
item_func.cc	Merge bk-internal:/home/bk/mysql-5.0	2006-09-18 19:01:07 +04:00
item_func.h	Merge bk-internal:/home/bk/mysql-5.0	2006-09-18 19:01:07 +04:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint	2006-09-28 07:30:24 -04:00
item_strfunc.h
item_subselect.cc
item_subselect.h
item_sum.cc
item_sum.h
item_timefunc.cc
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc
log_event.cc
log_event.h
Makefile.am	Bug#18888 Trying to overwrite sql/lex_hash.h during build	2006-09-25 20:01:39 +02:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h	Bug#21476: (Thread stack overrun not caught, causing SEGV)	2006-09-27 14:42:56 -04:00
mysqld.cc	Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown	2006-09-15 14:27:45 +02:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc	Merge chilla.local:/home/mydev/mysql-5.0--main	2006-09-21 10:55:23 +02:00
opt_range.h	merge fixes	2006-09-18 12:14:27 +02:00
opt_sum.cc
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
records.cc
repl_failsafe.cc
repl_failsafe.h
set_var.cc
set_var.h
slave.cc
slave.h
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc
sql_bitmap.h
sql_cache.cc
sql_cache.h
sql_class.cc
sql_class.h
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc
sql_delete.cc	Fixed bug #21493: crash for the second execution of a function	2006-09-16 09:50:48 -07:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc	Merge bk-internal:/home/bk/mysql-5.0-opt	2006-09-18 12:20:20 +02:00
sql_lex.cc	Merge bk-internal:/home/bk/mysql-5.0-opt	2006-09-18 12:20:20 +02:00
sql_lex.h	Merge bk-internal:/home/bk/mysql-5.0-opt	2006-09-18 12:20:20 +02:00
sql_list.cc
sql_list.h
sql_load.cc
sql_locale.cc
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl	2006-09-21 00:05:56 +02:00
sql_prepare.cc
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc	Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl	2006-09-23 05:58:48 +02:00
sql_select.h
sql_show.cc
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc	Fixed bug #21493: crash for the second execution of a function	2006-09-16 09:50:48 -07:00
sql_view.cc
sql_view.h
sql_yacc.yy	Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl	2006-09-21 00:05:56 +02:00
stacktrace.c	Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx	2006-09-07 00:59:08 +02:00
stacktrace.h
strfunc.cc
structs.h
table.cc
table.h
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
udf_example.c	Fix for bug #19121: Windows incompatible udf_example	2006-09-22 14:42:43 +02:00
udf_example.def	Fix for bug #19121: Windows incompatible udf_example	2006-09-22 14:42:43 +02:00
uniques.cc
unireg.cc
unireg.h
watchdog_mysqld