mariadb/sql
unknown 7020d1920a Merge pilot.blaudden:/home/msvensson/mysql/bug26536/my50-bug26536
into  pilot.blaudden:/home/msvensson/mysql/bug26536/my51-bug26536


include/my_time.h:
  Auto merged
sql/tztime.cc:
  Auto merged
2007-02-23 17:34:19 +01:00
..
examples After merge fix 2007-02-03 09:26:11 +01:00
share Update error message to make sure all error strings for same error 2007-02-15 11:21:55 +01: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 After merge fixes 2007-01-29 01:47:35 +02:00
event_data_objects.h
event_db_repository.cc After merge fixes 2007-01-29 01:47:35 +02:00
event_db_repository.h
event_queue.cc After merge fixes 2007-01-29 01:47:35 +02:00
event_queue.h
event_scheduler.cc
event_scheduler.h
events.cc
events.h
field.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2007-02-06 15:46:17 +01:00
field.h Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-02-13 16:08:01 -08:00
field_conv.cc Merge olga.mysql.com:/home/igor/mysql-5.0-opt 2007-02-13 01:34:36 -08:00
filesort.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-02-03 00:58:09 +02:00
frm_crypt.cc
gen_lex_hash.cc gen_lex_hash.cc: 2007-01-31 00:06:42 +01:00
gstream.cc
gstream.h
ha_ndbcluster.cc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-02-08 00:00:14 +07:00
ha_ndbcluster.h NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc: 2007-02-07 11:36:34 +01:00
ha_ndbcluster_binlog.cc Bug#26015 valgrind warning PollGuard::unlock_and_signal()/NdbCondition_Destroy 2007-02-06 22:06:13 +01:00
ha_ndbcluster_binlog.h Bug #26021 - valgrind reports error regarding handle_trailing_share and client thread share usage 2007-02-05 13:21:18 +07:00
ha_ndbcluster_tables.h
ha_partition.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-29 01:57:07 +02:00
ha_partition.h
handler.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-02-03 00:58:09 +02:00
handler.h
hash_filo.cc
hash_filo.h
hostname.cc
init.cc Merge mysql.com:/home/ram/work/b19690/b19690.5.0 2007-01-31 12:53:36 +04:00
item.cc Merge calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint 2007-02-14 11:38:39 -05:00
item.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-29 01:57:07 +02:00
item_buff.cc
item_cmpfunc.cc Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-02-13 16:08:01 -08:00
item_cmpfunc.h Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-02-13 16:08:01 -08:00
item_create.cc
item_create.h
item_func.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-02-03 00:58:09 +02:00
item_func.h
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 2007-02-14 14:51:49 +01:00
item_strfunc.h
item_subselect.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-02-03 00:58:09 +02:00
item_subselect.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-29 01:57:07 +02:00
item_sum.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2007-02-06 15:46:17 +01:00
item_sum.h
item_timefunc.cc Merge 192.168.0.10:mysql/mysql-5.1-maint 2007-02-06 15:50:24 +01:00
item_timefunc.h
item_xmlfunc.cc After merge fixes 2007-01-29 01:47:35 +02:00
item_xmlfunc.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc After merge fixes 2007-01-29 01:47:35 +02:00
log.h After merge fixes 2007-01-29 01:47:35 +02:00
log_event.cc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-02-05 12:19:24 +07:00
log_event.h
Makefile.am Clean "gen_lex_hash" if it's been built 2007-02-19 12:25:25 +01:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge 192.168.0.10:mysql/mysql-5.0-maint 2007-02-15 15:56:38 +01:00
mysqld.cc Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 2007-02-14 14:51:49 +01:00
mysqld.cc.rej
mysqld_suffix.h
net_serv.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2007-02-06 15:46:17 +01:00
nt_servc.cc
nt_servc.h
opt_range.cc Post-merge fix. 2007-02-13 13:15:23 -08:00
opt_range.h
opt_sum.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-02-02 10:25:45 +04:00
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc After merge fixes 2007-01-29 01:47:35 +02:00
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc After merge fixes 2007-01-29 01:47:35 +02:00
protocol.h Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb-bj 2007-02-01 17:34:20 +00:00
records.cc
repl_failsafe.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2007-02-06 15:46:17 +01:00
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc
rpl_injector.h
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 pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 2007-02-14 14:51:49 +01:00
set_var.h Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2007-02-06 15:46:17 +01:00
slave.cc Merge siva.hindu.god:/home/tsmith/m/bk/51 2007-02-08 16:02:58 -07:00
slave.h After merge fixes 2007-01-29 01:47:35 +02:00
sp.cc After merge fixes 2007-01-29 01:47:35 +02:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc After merge fixes 2007-01-29 01:47:35 +02:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc After merge fixes 2007-01-29 01:47:35 +02:00
spatial.h
sql_acl.cc
sql_acl.h
sql_analyse.cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 2007-02-06 17:18:43 +04:00
sql_analyse.h
sql_array.h
sql_base.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-02-02 10:25:45 +04:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc
sql_cache.h
sql_class.cc Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 2007-02-14 14:51:49 +01:00
sql_class.h Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 2007-02-14 14:51:49 +01:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc
sql_delete.cc after merge fix 2007-02-02 14:26:53 +04:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc Post-merge fix. 2007-02-13 13:15:23 -08:00
sql_lex.cc Merge olga.mysql.com:/home/igor/mysql-5.0-opt 2007-02-13 01:34:36 -08:00
sql_lex.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-02-03 00:58:09 +02:00
sql_list.cc
sql_list.h
sql_load.cc Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 2007-02-14 14:51:49 +01:00
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2007-02-06 15:46:17 +01:00
sql_parse.cc.rej
sql_partition.cc After merge fixes 2007-01-29 01:47:35 +02:00
sql_partition.h
sql_plugin.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-02-03 00:58:09 +02:00
sql_plugin.h
sql_prepare.cc Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 2007-02-13 10:27:39 +01:00
sql_rename.cc
sql_repl.cc Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943 2007-01-29 14:35:09 +01:00
sql_repl.h
sql_select.cc Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-02-13 16:08:01 -08:00
sql_select.h
sql_servers.cc After merge fixes 2007-01-29 01:47:35 +02:00
sql_servers.h After merge fixes 2007-01-29 01:47:35 +02:00
sql_show.cc Merge olga.mysql.com:/home/igor/mysql-5.0-opt 2007-02-13 01:34:36 -08:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-29 01:57:07 +02:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 2007-02-12 14:39:42 -05:00
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-29 01:57:07 +02:00
sql_update.cc Post-merge fix. 2007-02-13 13:15:23 -08:00
sql_view.cc Merge olga.mysql.com:/home/igor/mysql-5.0-opt 2007-02-13 01:34:36 -08:00
sql_view.h
sql_yacc.yy Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-02-03 00:58:09 +02:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 2007-02-13 23:35:06 +01:00
table.cc.rej
table.h Merge olga.mysql.com:/home/igor/mysql-5.0-opt 2007-02-13 01:34:36 -08:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Merge pilot.blaudden:/home/msvensson/mysql/bug26536/my50-bug26536 2007-02-23 17:34:19 +01:00
tztime.h
udf_example.c
udf_example.def
uniques.cc
unireg.cc Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 2007-02-12 14:49:34 +01:00
unireg.h