unknown cd784a51df Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 ... into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch configure.in: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged storage/federated/ha_federated.cc: Auto merged		2006-11-22 05:54:30 +01:00
..
examples	Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2	2006-10-16 17:39:38 +10:00
share	Bug#21114 (Foreign key creation fails to table with name format)	2006-11-02 11:01:53 -07:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt	Refactoring: Moved master info functionality into rpl_mi.cc to	2006-10-31 16:51:51 +01:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc	Remove direct mapping of enum interval_type to mysql.event.interval_field	2006-10-10 17:59:46 +02:00
event_data_objects.h
event_db_repository.cc	Remove direct mapping of enum interval_type to mysql.event.interval_field	2006-10-10 17:59:46 +02:00
event_db_repository.h
event_queue.cc
event_queue.h
event_scheduler.cc
event_scheduler.h
events.cc
events.h
field.cc	Merge bk-internal.mysql.com:/data0/bk/mysql-5.1	2006-11-22 05:54:30 +01:00
field.h	Merge bk-internal.mysql.com:/data0/bk/mysql-5.1	2006-11-22 05:54:30 +01:00
field_conv.cc	After merge fix	2006-10-03 16:00:09 +05:00
filesort.cc	Added a missing breakpoint. This could cause	2006-10-03 12:44:59 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2006-11-01 19:46:23 +02:00
ha_ndbcluster.h	Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb	2006-10-25 18:41:17 +10:00
ha_ndbcluster_binlog.cc	Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl	2006-11-13 15:48:39 +01:00
ha_ndbcluster_binlog.h
ha_ndbcluster_tables.h
ha_partition.cc	Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb	2006-10-18 15:17:47 +02:00
ha_partition.h	Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb	2006-10-18 15:17:47 +02:00
handler.cc	Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl	2006-11-13 12:45:31 +01:00
handler.h	Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location.	2006-11-19 18:01:54 -08:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc	Merge mysql.com:/usr/home/bar/mysql-5.0.b21505	2006-11-09 14:46:01 +04:00
item.h	Merge mysql.com:/usr/home/bar/mysql-5.0.b21505	2006-11-09 14:46:01 +04:00
item_buff.cc	Bug#22138: Unhandled NULL caused server crash	2006-10-11 19:44:12 +04:00
item_cmpfunc.cc	Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)	2006-11-01 19:41:09 +02:00
item_cmpfunc.h	Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt	2006-10-19 16:43:46 +02:00
item_create.cc	Bug#21114 (Foreign key creation fails to table with name format)	2006-11-02 11:01:53 -07:00
item_create.h	Bug#21114 (Foreign key creation fails to table with name format)	2006-11-02 11:01:53 -07:00
item_func.cc	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963	2006-11-08 10:12:06 -05:00
item_func.h	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint	2006-11-06 20:42:28 -05:00
item_geofunc.cc
item_geofunc.h	Bug#21114 (Foreign key creation fails to table with name format)	2006-11-02 11:01:53 -07:00
item_row.cc
item_row.h
item_strfunc.cc	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963	2006-11-08 10:12:06 -05:00
item_strfunc.h
item_subselect.cc
item_subselect.h
item_sum.cc	Merge mysql.com:/usr/home/bar/mysql-5.0.b23451	2006-11-08 22:14:36 +04:00
item_sum.h	Merge bodhi.local:/opt/local/work/mysql-5.0-runtime	2006-10-23 12:35:56 +04:00
item_timefunc.cc	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1	2006-11-10 15:05:38 +03:00
item_timefunc.h
item_uniq.cc
item_uniq.h
item_xmlfunc.cc	Bug#22823 gt and lt operators appear to be reversed in ExtractValue() command	2006-10-23 14:17:57 +05:00
item_xmlfunc.h
key.cc
lex.h	Merge alik.:/mnt/raid/alik/MySQL/devel/5.1	2006-11-07 16:24:35 +03:00
lex_symbol.h	Bug#21114 (Foreign key creation fails to table with name format)	2006-11-02 11:01:53 -07:00
lock.cc	Fix for Bug #17544 "Cannot do atomic log rotate",	2006-10-13 17:26:46 +04:00
log.cc	Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl	2006-11-13 12:45:31 +01:00
log.h	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime	2006-10-24 17:00:23 +04:00
log_event.cc	BUG#24403 (valgrind complaint on uninited st_table for innodb + rbr):	2006-11-21 13:57:52 +01:00
log_event.h	Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0	2006-11-14 13:04:40 +02:00
Makefile.am	Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl	2006-11-13 12:45:31 +01:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h	Merge bk-internal.mysql.com:/data0/bk/mysql-5.1	2006-11-22 05:54:30 +01:00
mysqld.cc	Merge bk-internal.mysql.com:/data0/bk/mysql-5.1	2006-11-22 05:54:30 +01:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc	Fix for bug #23762: partition.test fails (partition_hash, partition_pruning as well)	2006-11-02 17:11:53 +04:00
opt_range.h	Fix for bug #23762: partition.test fails (partition_hash, partition_pruning as well)	2006-11-02 17:11:53 +04:00
opt_sum.cc	Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge	2006-10-18 18:51:39 +10:00
parse_file.cc	Bug#21370: View renaming lacks tablename_to_filename encoding	2006-10-16 22:42:03 +05:00
parse_file.h	Fix for bug#15228 "'invalid access to non-static data member'	2006-10-20 15:47:52 +04:00
partition_element.h
partition_info.cc	Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)	2006-11-01 19:41:09 +02:00
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc	Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)	2006-11-01 19:41:09 +02:00
protocol.h
records.cc
repl_failsafe.cc	Refactoring: Moved rli code to new file rpl_rli.cc. The idea being that rli	2006-10-31 12:23:14 +01:00
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc	Fixing problem in injector code making NDB tests fire an assertion.	2006-11-13 15:42:01 +01:00
rpl_injector.h
rpl_mi.cc	Refactoring: Moved master info functionality into rpl_mi.cc to	2006-10-31 16:51:51 +01:00
rpl_mi.h	Refactoring: Moved master info functionality into rpl_mi.cc to	2006-10-31 16:51:51 +01:00
rpl_rli.cc	Post-merge fixes.	2006-11-03 21:55:51 +01:00
rpl_rli.h	Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl	2006-11-03 21:11:58 +01:00
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
set_var.cc	This straightens up usage of have_ variables, and removes dead -skip-isam option.	2006-11-20 14:04:07 -08:00
set_var.h
slave.cc	Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge	2006-11-13 17:59:51 +01:00
slave.h	Refactoring: Moved master info functionality into rpl_mi.cc to	2006-10-31 16:51:51 +01:00
sp.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2006-11-02 17:51:59 -05:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc	Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty	2006-11-03 14:00:35 +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 bk-internal.mysql.com:/home/bk/mysql-5.0-maint	2006-10-13 08:57:15 -04:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc	Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty	2006-11-03 14:00:35 +03:00
sql_binlog.cc	BUG#19459 (BINLOG RBR command does not lock tables correctly causing	2006-10-06 10:17:02 +02:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc
sql_cache.h
sql_class.cc	BUG#24403 (valgrind complaint on uninited st_table for innodb + rbr):	2006-11-21 13:57:52 +01:00
sql_class.h	Merge alik.:/mnt/raid/alik/MySQL/devel/5.1	2006-11-07 16:24:35 +03:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint	2006-10-13 08:57:15 -04:00
sql_delete.cc	Merge bk-internal.mysql.com:/home/bk/mysql-4.1	2006-11-02 17:27:42 -05:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc	Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)	2006-11-01 19:41:09 +02:00
sql_lex.cc	Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime	2006-11-02 13:59:44 +01:00
sql_lex.h	Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime	2006-11-02 13:59:44 +01:00
sql_list.cc
sql_list.h
sql_load.cc	BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.	2006-10-06 13:34:07 +04:00
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl	2006-11-13 12:45:31 +01:00
sql_partition.cc	Merge dator5.(none):/home/pappa/clean-mysql-5.1	2006-10-16 15:40:40 -04:00
sql_partition.h	Merge dator5.(none):/home/pappa/clean-mysql-5.1	2006-10-16 15:40:40 -04:00
sql_plugin.cc	Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location.	2006-11-19 18:01:54 -08:00
sql_plugin.h
sql_prepare.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2006-11-02 17:51:59 -05:00
sql_rename.cc	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime	2006-10-24 17:00:23 +04:00
sql_repl.cc	Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge	2006-11-13 17:59:51 +01:00
sql_repl.h
sql_select.cc	Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl	2006-11-13 12:45:31 +01:00
sql_select.h	Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt	2006-10-19 16:43:46 +02:00
sql_show.cc	Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl	2006-11-07 19:26:31 +01:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc	Merge mysql.com:/usr/home/bar/mysql-5.0.b18908	2006-11-01 16:48:03 +04:00
sql_string.h	Merge mysql.com:/usr/home/bar/mysql-5.0.b18908	2006-11-01 16:48:03 +04:00
sql_table.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2006-11-02 17:51:59 -05:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2006-11-02 17:51:59 -05:00
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2006-11-02 17:51:59 -05:00
sql_update.cc	Merge bk-internal.mysql.com:/home/bk/mysql-4.1	2006-11-02 01:08:39 +03:00
sql_view.cc	Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl	2006-11-13 12:45:31 +01:00
sql_view.h	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint	2006-10-13 08:57:15 -04:00
sql_yacc.yy	Merge alik.:/mnt/raid/alik/MySQL/devel/5.1	2006-11-07 16:24:35 +03:00
stacktrace.c	Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint	2006-10-20 14:32:31 +04:00
stacktrace.h
strfunc.cc	Remove direct mapping of enum interval_type to mysql.event.interval_field	2006-10-10 17:59:46 +02:00
structs.h
table.cc	BUG#24403 (valgrind complaint on uninited st_table for innodb + rbr):	2006-11-21 13:57:52 +01:00
table.h
thr_malloc.cc
time.cc	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1	2006-11-10 15:05:38 +03:00
tzfile.h
tztime.cc	Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191	2006-11-06 00:00:44 +03:00
tztime.h
udf_example.c
udf_example.def
uniques.cc
unireg.cc	Merge mysql.com:/home/hf/mysql-5.0.mrg	2006-10-12 15:42:05 +05:00
unireg.h