mariadb/sql
unknown 23a30bdb1d Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2006-12-04 15:30:55 -05:00
..
examples
share Bug#24736: UDF functions parsed as Stored Functions 2006-12-01 19:16:03 -07: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 Removed compiler warnings 2006-11-27 18:16:08 +02:00
event_data_objects.h Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
event_db_repository.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
event_db_repository.h
event_queue.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
event_queue.h
event_scheduler.cc Removed compiler warnings 2006-11-27 18:16:08 +02:00
event_scheduler.h
events.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
events.h
field.cc Merge bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01:00
field.h Merge bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01:00
field_conv.cc Merge 192.168.0.5:mysql/mysql-5.1-maint 2006-11-29 23:53:07 +01:00
filesort.cc Merge bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-11-29 15:44:09 +01:00
ha_ndbcluster.h
ha_ndbcluster_binlog.cc Removed compiler warnings 2006-11-27 18:16:08 +02:00
ha_ndbcluster_binlog.h
ha_ndbcluster_tables.h Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +02:00
ha_partition.cc Removed compiler warnings 2006-11-27 18:16:08 +02:00
ha_partition.h
handler.cc Merge 192.168.0.5:mysql/mysql-5.1-maint 2006-11-29 23:53:07 +01:00
handler.h Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-11-07 06:59:51 +01:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-11-29 15:44:09 +01:00
item.h Merge bk@192.168.21.1:mysql-5.1-opt 2006-11-17 19:01:35 +04:00
item_buff.cc
item_cmpfunc.cc Merge bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01:00
item_cmpfunc.h Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
item_create.cc Bug#24736: UDF functions parsed as Stored Functions 2006-12-01 19:16:03 -07:00
item_create.h
item_func.cc Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-11-29 15:44:09 +01:00
item_func.h Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-11-29 15:44:09 +01:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Removed compiler warnings 2006-11-27 18:16:08 +02:00
item_strfunc.h
item_subselect.cc Merge bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01:00
item_subselect.h Merge mysql.com:/home/hf/work/mysql-5.0-mrg 2006-11-17 18:27:28 +04:00
item_sum.cc Merge bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01:00
item_sum.h Merge bk@192.168.21.1:mysql-5.1-opt 2006-11-17 19:01:35 +04:00
item_timefunc.cc Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-11-29 15:44:09 +01:00
item_timefunc.h Merge bk@192.168.21.1:mysql-5.0-opt 2006-11-17 10:30:16 +04:00
item_uniq.cc
item_uniq.h
item_xmlfunc.cc
item_xmlfunc.h
key.cc Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +02:00
lex.h Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 2006-11-07 16:24:35 +03:00
lex_symbol.h
lock.cc
log.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
log.h
log_event.cc Removed compiler warnings 2006-11-27 18:16:08 +02: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/kent/bk/mysql-5.0-build 2006-11-29 14:35:59 +01:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
my_decimal.h Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
my_lock.c
mysql_priv.h Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-11-29 15:44:09 +01:00
mysqld.cc Merge 192.168.0.10:mysql/work/my51-work 2006-11-29 22:52:32 +01:00
mysqld.cc.rej Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 2006-11-16 14:38:45 +02:00
mysqld_suffix.h
net_serv.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01:00
opt_range.h
opt_sum.cc
parse_file.cc
parse_file.h Removed compiler warnings 2006-11-27 18:16:08 +02:00
partition_element.h
partition_info.cc
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc Merge mysql.com:/home/hf/work/mysql-5.0-mrg 2006-11-17 18:27:28 +04:00
protocol.h Merge mysql.com:/home/hf/work/mysql-4.1-mrg 2006-11-16 23:16:44 +04:00
records.cc Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
repl_failsafe.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02: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
rpl_mi.h
rpl_rli.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02: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 Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
rpl_tblmap.h
rpl_utility.cc Removed compiler warnings 2006-11-27 18:16:08 +02:00
rpl_utility.h
set_var.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
set_var.h
slave.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
slave.h
sp.cc Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043 2006-11-28 17:34:03 +01:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +02:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-11-29 15:44:09 +01:00
sql_binlog.cc Removed compiler warnings 2006-11-27 18:16:08 +02:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Removed compiler warnings 2006-11-27 18:16:08 +02:00
sql_cache.h
sql_class.cc Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 2006-12-04 15:30:55 -05:00
sql_class.h Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 2006-12-04 15:30:55 -05:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 2006-11-16 14:38:45 +02:00
sql_delete.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +02:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-11-29 15:44:09 +01:00
sql_help.cc
sql_insert.cc
sql_lex.cc Bug#24736: UDF functions parsed as Stored Functions 2006-12-01 19:16:03 -07:00
sql_lex.h Bug#24736: UDF functions parsed as Stored Functions 2006-12-01 19:16:03 -07: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 Merge naruto.:C:/cpp/bug17733/my51-bug17733 2006-12-04 14:34:56 +01:00
sql_parse.cc.rej
sql_partition.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
sql_partition.h
sql_plugin.cc
sql_plugin.h
sql_prepare.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
sql_rename.cc
sql_repl.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +02:00
sql_repl.h
sql_select.cc Merge bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01:00
sql_select.h Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
sql_show.cc Merge bk@192.168.21.1:mysql-5.1-opt 2006-11-17 19:01:35 +04:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 2006-12-01 16:27:48 +01:00
sql_tablespace.cc
sql_test.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
sql_trigger.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +02:00
sql_view.cc Remove compiler warnings 2006-11-20 22:42:06 +02:00
sql_view.h
sql_yacc.yy Bug#24736: UDF functions parsed as Stored Functions 2006-12-01 19:16:03 -07:00
stacktrace.c
stacktrace.h
strfunc.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +02:00
structs.h
table.cc Merge bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01:00
table.cc.rej
table.h Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
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 Removed compiler warnings 2006-11-27 18:16:08 +02:00
tztime.h
udf_example.c Fix netware compile failure 2006-11-23 20:07:53 +01:00
udf_example.def Add the two new functions to udf_example.def so they will be exported by dll's 2006-11-16 16:19:29 +01:00
uniques.cc
unireg.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +02:00
unireg.h