unknown 54d26e027f Merge stella.local:/home2/mydev/mysql-5.0-axmrg ... into stella.local:/home2/mydev/mysql-5.1-axmrg mysql-test/r/merge.result: Auto merged mysql-test/t/merge.test: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged sql/sql_yacc.yy: Manual merge		2008-03-14 19:30:49 +01:00
..
examples
share
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc
event_data_objects.h
event_db_repository.cc
event_db_repository.h
event_queue.cc	Fix for bug#22738 Events: After stop and start disabled events could reside in the queue	2008-02-22 16:18:31 +01:00
event_queue.h
event_scheduler.cc
event_scheduler.h
events.cc	Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime	2008-02-22 16:20:05 +01:00
events.h
field.cc	Manual merge	2008-03-14 12:02:11 +01:00
field.h	Manual merge	2008-03-14 12:02:11 +01:00
field_conv.cc
filesort.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1	2008-02-26 19:34:02 +03:00
ha_ndbcluster.h
ha_ndbcluster_binlog.cc	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1	2008-02-26 19:34:02 +03:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc	Merge mysql.com:/misc/mysql/34749/50-34749	2008-03-10 07:07:56 +01:00
ha_ndbcluster_cond.h	Merge mysql.com:/misc/mysql/34749/50-34749	2008-03-10 07:07:56 +01:00
ha_ndbcluster_tables.h
ha_partition.cc	Pre push fixes	2008-02-24 19:13:18 +01:00
ha_partition.h
handler.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
handler.h
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc	Manual merge	2008-03-14 12:02:11 +01:00
item.h	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
item_buff.cc
item_cmpfunc.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
item_cmpfunc.h	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_create.cc	Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2	2008-03-07 15:28:51 +04:00
item_create.h
item_func.cc	Manual merge	2008-03-14 12:02:11 +01:00
item_func.h	Manual merge	2008-03-14 12:02:11 +01:00
item_geofunc.cc
item_geofunc.h	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_row.cc	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_row.h	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_strfunc.cc	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_strfunc.h	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_subselect.cc	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_subselect.h	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_sum.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
item_sum.h	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_timefunc.cc	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_timefunc.h	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
item_xmlfunc.cc
item_xmlfunc.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc	Manual merge	2008-03-14 12:02:11 +01:00
log.h
log_event.cc	Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines	2008-03-07 13:46:29 -08:00
log_event.h
log_event_old.cc	Bug#34655 Compile error	2008-02-28 14:55:46 -03:00
log_event_old.h
Makefile.am
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h	Manual merge	2008-03-14 12:02:11 +01:00
mysqld.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
mysqld_suffix.h
net_serv.cc	Bug#34655 Compile error	2008-02-28 14:55:46 -03:00
nt_servc.cc
nt_servc.h
opt_range.cc
opt_range.h
opt_sum.cc
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc	Manual merge	2008-03-14 12:02:11 +01:00
partition_info.h	Manual merge	2008-03-14 12:02:11 +01:00
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
records.cc
repl_failsafe.cc	Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines	2008-03-07 13:46:29 -08:00
repl_failsafe.h
rpl_constants.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc
rpl_injector.h
rpl_mi.cc
rpl_mi.h
rpl_record.cc
rpl_record.h
rpl_record_old.cc
rpl_record_old.h
rpl_reporting.cc
rpl_reporting.h
rpl_rli.cc	Manual merge	2008-03-14 12:02:11 +01:00
rpl_rli.h	BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if	2008-02-27 21:46:06 +04:00
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
scheduler.cc
scheduler.h
set_var.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
set_var.h
slave.cc	Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines	2008-03-07 13:46:29 -08:00
slave.h	BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if	2008-02-22 19:07:07 +04:00
sp.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc
sql_cache.h
sql_class.cc	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1	2008-02-26 19:34:02 +03:00
sql_class.h	Merge buzz.(none):/home/davi/mysql-5.0-runtime	2008-02-28 20:22:50 -03:00
sql_client.cc
sql_connect.cc	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1	2008-02-26 19:34:02 +03:00
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc
sql_delete.cc
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc	Fix for bug #34889: mysql_client_test::test_mysql_insert_id test fails	2008-03-05 16:02:33 +03:00
sql_lex.cc	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
sql_lex.h	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
sql_list.cc
sql_list.h
sql_load.cc
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	Manual merge	2008-03-14 12:02:11 +01:00
sql_partition.cc	Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines	2008-03-07 13:46:29 -08:00
sql_partition.h
sql_plugin.cc	Manual merge	2008-03-14 12:02:11 +01:00
sql_plugin.h
sql_prepare.cc	Bug#28386 the general log is incomplete	2008-02-25 07:48:02 -03:00
sql_profile.cc
sql_profile.h
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
sql_select.h
sql_servers.cc
sql_servers.h
sql_show.cc	Manual merge	2008-03-14 12:02:11 +01:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc	Bug#23924 general_log truncates queries with character set introducers.	2008-02-29 17:56:50 +04:00
sql_string.h	Bug#23924 general_log truncates queries with character set introducers.	2008-02-29 17:56:50 +04:00
sql_table.cc	Post-merge fix. Moved the symlink handling from sql_parse.cc here.	2008-03-14 14:03:47 +01:00
sql_tablespace.cc
sql_test.cc	Fix for Bug#30217: Views: changes in metadata behaviour	2008-02-22 13:30:33 +03:00
sql_trigger.cc
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc
sql_view.cc	We never check the return value of mysql_frm_type for an error. Do	2008-02-26 16:19:23 +03:00
sql_view.h
sql_yacc.yy	Merge stella.local:/home2/mydev/mysql-5.0-axmrg	2008-03-14 19:30:49 +01:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc
table.h	Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt	2008-03-12 13:56:50 +03:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
udf_example.c
udf_example.def
uniques.cc
unireg.cc
unireg.h