mariadb/sql
unknown 2b0189b812 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
2006-12-18 17:57:34 +01:00
..
examples
share Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 2006-12-08 22:30:18 -05:00
.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 Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
event_data_objects.h
event_db_repository.cc
event_db_repository.h
event_queue.cc
event_queue.h
event_scheduler.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
event_scheduler.h
events.cc
events.h
field.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-18 17:57:34 +01:00
field.h Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-18 17:57:34 +01:00
field_conv.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-09 02:34:42 +01:00
filesort.cc
frm_crypt.cc
gen_lex_hash.cc Fixed compiler warnings 2006-11-30 21:56:03 +02:00
gstream.cc
gstream.h
ha_ndbcluster.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
ha_ndbcluster.h bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated 2006-11-30 23:10:11 +01:00
ha_ndbcluster_binlog.cc Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
ha_ndbcluster_binlog.h Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
ha_ndbcluster_tables.h Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
ha_partition.cc
ha_partition.h Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
handler.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-09 02:34:42 +01:00
handler.h
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-09 02:34:42 +01:00
item.h Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt 2006-11-29 11:48:44 +01:00
item_buff.cc
item_cmpfunc.cc Merge bk@192.168.21.1:mysql-5.1-opt 2006-12-06 12:56:11 +04:00
item_cmpfunc.h
item_create.cc Apply malff@weblab.(none) fix for bug 24736 directly to 2006-12-04 11:38:40 -07:00
item_create.h
item_func.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-09 02:34:42 +01:00
item_func.h Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 2006-12-01 13:02:54 +01:00
item_strfunc.h
item_subselect.cc This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
item_subselect.h Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-03 21:19:35 +01:00
item_sum.cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 2006-12-01 13:02:54 +01:00
item_sum.h Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-03 21:19:35 +01:00
item_timefunc.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-09 02:34:42 +01:00
item_timefunc.h
item_uniq.cc
item_uniq.h
item_xmlfunc.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
item_xmlfunc.h
key.cc
lex.h WL# 3031 2006-12-01 19:47:45 -05:00
lex_symbol.h
lock.cc
log.cc Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 2006-12-01 21:12:13 +01:00
log.h Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2006-12-01 11:35:05 +08:00
log_event.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-03 21:19:35 +01:00
log_event.h Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
Makefile.am WL# 3031 2006-12-01 19:47:45 -05:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 2006-12-08 22:30:18 -05:00
mysqld.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 2006-12-08 22:30:18 -05:00
mysqld.cc.rej
mysqld_suffix.h
net_serv.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-03 21:19:35 +01:00
opt_range.h
opt_sum.cc
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
partition_info.h
password.c Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02: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
rpl_injector.h Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
rpl_mi.cc
rpl_mi.h
rpl_rli.cc
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
set_var.cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 2006-12-01 13:02:54 +01:00
set_var.h
slave.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
slave.h
sp.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-09 02:34:42 +01:00
sp.h
sp_cache.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sp_cache.h
sp_head.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
sql_acl.h
sql_analyse.cc This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
sql_analyse.h
sql_array.h
sql_base.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 2006-12-01 13:02:54 +01:00
sql_cache.h
sql_class.cc Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 2006-12-05 10:32:16 -05:00
sql_class.h Merge bk-internal:/home/bk/mysql-5.1-maint 2006-12-05 10:54:17 +01:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_delete.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_help.cc
sql_insert.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-03 21:19:35 +01:00
sql_lex.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 2006-12-08 22:30:18 -05:00
sql_lex.h Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 2006-12-08 22:30:18 -05:00
sql_list.cc
sql_list.h
sql_load.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-18 17:57:34 +01:00
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 2006-12-08 22:30:18 -05:00
sql_parse.cc.rej
sql_partition.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
sql_partition.h
sql_plugin.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
sql_plugin.h
sql_prepare.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_rename.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-30 22:38:12 +02:00
sql_repl.cc Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2006-12-01 11:35:05 +08:00
sql_repl.h
sql_select.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-03 21:19:35 +01:00
sql_select.h This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
sql_servers.cc WL# 3031 2006-12-01 19:47:45 -05:00
sql_servers.h WL# 3031 2006-12-01 19:47:45 -05:00
sql_show.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-03 21:19:35 +01:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt 2006-11-29 11:48:44 +01:00
sql_table.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-09 02:34:42 +01:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 2006-12-01 13:02:54 +01:00
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
sql_update.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_view.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_view.h
sql_yacc.yy Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 2006-12-08 22:30:18 -05:00
sql_yacc.yy.bak WL# 3031 2006-12-01 19:47:45 -05:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-03 21:19:35 +01:00
table.cc.rej
table.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-29 22:54:11 +02:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-30 22:38:12 +02:00
tztime.h
udf_example.c
udf_example.def
uniques.cc Fixed compiler warnings 2006-11-30 21:56:03 +02:00
unireg.cc This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
unireg.h