mariadb/sql
unknown 97f0b6452d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.mysql.fi:/home/my/mysql-5.0


sql/unireg.cc:
  Auto merged
2005-09-14 03:18:05 +03:00
..
examples Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-09-12 17:00:50 -07:00
share Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-03 03:25:59 +04:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
field.h Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
field_conv.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
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 bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-15 18:35:48 +03:00
ha_berkeley.h Fixes during review of new pushed code 2005-08-12 13:54:42 +03: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 Fixed minor error message bug from work for WL#2414 2005-09-13 11:59:19 -07:00
ha_federated.h This patch disables the query cache for the federated engine. 2005-09-04 11:25:13 -07:00
ha_heap.cc
ha_heap.h
ha_innodb.cc InnoDB: Reject foreign keys in temporary tables. Closes bug #12084. 2005-09-06 14:38:21 +03:00
ha_innodb.h Bug #11946: Review fixes. 2005-08-30 12:39:20 +03:00
ha_myisam.cc
ha_myisam.h
ha_myisammrg.cc
ha_myisammrg.h
ha_ndbcluster.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
ha_ndbcluster.h
handler.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
handler.h Made changes to add federated CONNECTION information to the .frm file 2005-09-12 18:02:17 -07: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 Fixes during review of new pushed code 2005-08-12 13:54:42 +03:00
item.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-14 01:47:38 +03: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 Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04:00
item_create.h Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04:00
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 Rename: 2005-09-02 17:21:19 +04:00
item_subselect.h Rename: 2005-09-02 17:21:19 +04:00
item_sum.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
item_sum.h Merge 4.1->5.0 2005-09-09 10:54:59 +04:00
item_timefunc.cc Make SYSDATE() behave as in Oracle: always the current datetime, not the 2005-08-24 15:50:58 -07:00
item_timefunc.h Make SYSDATE() behave as in Oracle: always the current datetime, not the 2005-08-24 15:50:58 -07:00
item_uniq.cc
item_uniq.h
key.cc
lex.h Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 17:39:02 +04:00
lex_symbol.h
lock.cc Cleanups during review of new code 2005-08-11 15:58:15 +03:00
log.cc Fix for BUG#12637: Make SPs+user variables replication work: 2005-09-07 19:39:47 +04:00
log_event.cc Merge mysql.com:/users/lthalmann/bk/mysql-4.1 2005-09-02 11:01:00 +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 Include the new header file in an appropriate macro. 2005-08-25 21:41:50 +02:00
matherr.c
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 2005-09-06 20:51:15 +03:00
mysqld.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 2005-09-06 21:20:19 +03: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 join_outer.result, opt_range.cc, item_cmpfunc.cc: 2005-09-07 17:42:47 +04: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
set_var.cc Fix for bug#11775 Variable character_set_system does not exist (sometimes). 2005-09-07 15:38:09 +05:00
set_var.h Fix for bug#11775 Variable character_set_system does not exist (sometimes). 2005-09-07 15:38:09 +05:00
slave.cc Merge xiphis.org:/usr/home/antony/work2/mysql-4.1 2005-08-11 12:18:53 +01:00
slave.h
sp.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
sp.h Avoid spurious error when restoring INFORMATION_SCHEMA as the current 2005-08-11 17:04:16 -07:00
sp_cache.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-11 16:43:22 +03:00
sp_cache.h
sp_head.cc Fixed BUG#13133: Local variables in stored procedures are not initialized correctly. 2005-09-13 12:50:21 +02: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 Fixed BUG#13133: Local variables in stored procedures are not initialized correctly. 2005-09-13 12:50:21 +02:00
sp_pcontext.h Fixed BUG#13133: Local variables in stored procedures are not initialized correctly. 2005-09-13 12:50:21 +02:00
sp_rcontext.cc Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory 2005-08-18 11:23:54 +02:00
sp_rcontext.h Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04:00
spatial.cc
spatial.h
sql_acl.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
sql_acl.h Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423 2005-09-01 23:25:29 +04:00
sql_analyse.cc Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-09-13 18:23:37 +03:00
sql_analyse.h
sql_array.h Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04:00
sql_base.cc Merge 2005-09-13 22:22:51 +04:00
sql_bitmap.h
sql_cache.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 2005-09-06 20:51:15 +03: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 Fixed BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error 2005-09-13 15:32:42 +02:00
sql_class.h Fixed BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error 2005-09-13 15:32:42 +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 sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2005-09-01 22:42:37 +03:00
sql_derived.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-15 18:35:48 +03:00
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
sql_insert.cc postmerge changes 2005-09-02 09:50:17 +03:00
sql_lex.cc Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures". 2005-09-03 03:13:18 +04:00
sql_lex.h Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures". 2005-09-03 03:13:18 +04:00
sql_list.cc
sql_list.h Add a comment about I_List<> copy constructor. 2005-08-22 19:23:01 +04:00
sql_load.cc Implementation of WL#2486 - 2005-08-12 17:57:19 +03:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc Implementation of WL#2486 - 2005-08-12 17:57:19 +03:00
sql_parse.cc Merge mysql.com:/home/timka/mysql/src/5.0-virgin 2005-09-13 13:51:25 +03:00
sql_prepare.cc sql_prepare.cc: 2005-09-13 10:15:48 +02:00
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 2005-09-12 20:18:49 +03:00
sql_select.h Remove an obsolete comment and an unused variable. 2005-09-08 18:51:36 +04:00
sql_show.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-14 01:47:38 +03:00
sql_test.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-15 12:37:45 -07:00
sql_trigger.cc Save and clear run context before executing a stored function or trigger and restore it afterwards. 2005-08-15 18:15:12 +03:00
sql_trigger.h Save and clear run context before executing a stored function or trigger and restore it afterwards. 2005-08-15 18:15:12 +03:00
sql_udf.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
sql_udf.h
sql_union.cc Rename: 2005-09-02 17:21:19 +04:00
sql_update.cc Slightly amended Monty's SP replication code cleanup patch 2005-08-27 02:33:06 +04: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 eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-13 10:17:40 -07:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Made changes to add federated CONNECTION information to the .frm file 2005-09-12 18:02:17 -07:00
table.h Made changes to add federated CONNECTION information to the .frm file 2005-09-12 18:02:17 -07:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
tztime.h
udf_example.cc
uniques.cc
unireg.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-14 03:18:05 +03:00
unireg.h unireg.h: 2005-08-27 01:50:38 +02:00
watchdog_mysqld