unknown fc8a066a8b Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new ... into neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new sql/item.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/table.h: Auto merged		2005-09-13 12:44:58 +02:00
..
examples	Merge	2005-09-13 05:33:11 +02:00
share	errmsg.txt:	2005-09-08 12:52:24 -05:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc
field.h
field_conv.cc
filesort.cc	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1	2005-09-12 20:18:49 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-08-25 13:11:38 -04:00
ha_berkeley.h	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-08-25 13:11:38 -04:00
ha_blackhole.cc	ha_blackhole.cc:	2005-08-30 02:46:03 +02:00
ha_blackhole.h	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1	2005-08-26 15:56:52 +03:00
ha_federated.cc	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	2005-09-07 09:39:38 +02:00
ha_federated.h	Merge	2005-09-06 09:20:15 +02:00
ha_heap.cc
ha_heap.h	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-08-25 13:11:38 -04:00
ha_innodb.cc	Merge 127.(none):/home/osku/mysql/5.0/12084	2005-09-08 11:36:11 +03:00
ha_innodb.h	merge	2005-08-31 20:45:48 +02:00
ha_myisam.cc
ha_myisam.h
ha_myisammrg.cc
ha_myisammrg.h
ha_ndbcluster.cc	Merge	2005-09-12 14:22:06 +02:00
ha_ndbcluster.h
ha_partition.cc
ha_partition.h
handler.cc	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-09-09 15:26:47 +02:00
handler.h	merge	2005-08-31 20:45:48 +02:00
hash_filo.cc
hash_filo.h
hostname.cc	Backport of JimW's localhost patch to 4.1 tree.	2005-09-02 17:07:05 -07:00
init.cc
item.cc	Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new	2005-09-13 12:44:58 +02:00
item.h	fix for Bug #12849 Stored Procedure: Crash on procedure call with CHAR type 'INOUT' parameter	2005-09-08 18:25:42 +02:00
item_buff.cc
item_cmpfunc.cc	Merged from 4.1 to 5.0.	2005-09-13 01:44:50 +03:00
item_cmpfunc.h	merged	2005-09-09 09:44:58 +02:00
item_create.cc
item_create.h
item_func.cc	Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-09-09 10:08:46 +04:00
item_func.h	func_str.result, null.result:	2005-08-26 22:25:45 -07:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	2005-08-31 15:24:06 -07:00
item_strfunc.h
item_subselect.cc	Merge	2005-09-06 09:20:15 +02:00
item_subselect.h	Rename:	2005-09-02 17:21:19 +04:00
item_sum.cc	Merge 4.1->5.0	2005-09-09 10:54:59 +04:00
item_sum.h	Merge 4.1->5.0	2005-09-09 10:54:59 +04:00
item_timefunc.cc
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc
lex.h	merge	2005-08-31 20:45:48 +02:00
lex_symbol.h
lock.cc	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-08-25 13:11:38 -04:00
log.cc	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-09-09 15:26:47 +02:00
log_event.cc	Merge	2005-09-06 09:20:15 +02:00
log_event.h	Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".	2005-09-03 03:13:18 +04:00
Makefile.am	merge	2005-08-31 20:45:48 +02:00
matherr.c
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	2005-09-07 09:39:38 +02:00
mysqld.cc	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	2005-09-07 09:39:38 +02:00
mysqld_suffix.h
net_serv.cc	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	2005-09-12 17:00:50 -07:00
nt_servc.cc
nt_servc.h
opt_range.cc	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-09-09 15:26:47 +02:00
opt_range.h
opt_sum.cc
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
protocol_cursor.cc
records.cc
repl_failsafe.cc
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
set_var.cc	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-09-09 15:26:47 +02:00
set_var.h	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-09-09 15:26:47 +02:00
slave.cc	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-08-25 13:11:38 -04:00
slave.h
sp.cc	Merge	2005-09-06 09:20:15 +02:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc	Fix for valgrind warning/crashes: When executing SP statement, If we set	2005-09-09 20:09:37 +04:00
sp_head.h	Fix for BUG#12637: Make SPs+user variables replication work:	2005-09-07 19:39:47 +04:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc	Commit the last part of the manual merge	2005-09-02 13:44:55 +02:00
sql_acl.h	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	2005-09-02 08:59:59 +02:00
sql_analyse.cc	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1	2005-09-11 11:07:56 +03:00
sql_analyse.h
sql_array.h
sql_base.cc	Merge	2005-09-12 14:22:06 +02:00
sql_bitmap.h
sql_cache.cc	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	2005-09-07 09:39:38 +02:00
sql_cache.h	Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1	2005-09-06 20:51:15 +03:00
sql_class.cc	Post-merge fixes. Call sp_cache_clear in THD::cleanup.	2005-09-09 11:43:26 +04:00
sql_class.h	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-09-09 15:26:47 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1	2005-09-12 20:18:49 +03:00
sql_delete.cc	Merge	2005-09-06 09:20:15 +02:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-08-25 13:11:38 -04:00
sql_help.cc	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-08-25 13:11:38 -04:00
sql_insert.cc	Merge	2005-09-06 09:20:15 +02:00
sql_lex.cc	Merge	2005-09-06 09:20:15 +02:00
sql_lex.h	Merge	2005-09-06 09:20:15 +02:00
sql_list.cc
sql_list.h
sql_load.cc	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-08-25 13:11:38 -04:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	Merge	2005-09-13 05:33:11 +02:00
sql_partition.cc	Test to see if my commit emails go through	2005-08-26 21:11:56 -04:00
sql_prepare.cc	Bug #13040: Merge error causing partition error	2005-09-07 17:28:27 -04:00
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc	Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new	2005-09-13 12:44:58 +02:00
sql_select.h	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-09-09 15:26:47 +02:00
sql_show.cc	Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new	2005-09-13 12:44:58 +02:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc	Merge	2005-09-13 05:33:11 +02:00
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc	Rename:	2005-09-02 17:21:19 +04:00
sql_update.cc	Merge	2005-09-06 09:20:15 +02:00
sql_view.cc	Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0	2005-09-02 17:06:15 +03:00
sql_view.h
sql_yacc.yy	Merge	2005-09-13 05:33:11 +02:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc	Merge	2005-09-06 09:20:15 +02:00
table.h	Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new	2005-09-13 12:44:58 +02:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
udf_example.cc
uniques.cc
unireg.cc
unireg.h	merge	2005-08-31 20:45:48 +02:00
watchdog_mysqld