mariadb/sql
jimw@mysql.com 3c10ccd3f7 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-05 07:52:55 -08:00
..
examples 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
share small Makefile.am cleanup 2005-01-28 17:14:03 +01:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Merge changes 2005-02-04 11:59:02 -08:00
field.h Merge 2005-02-04 12:01:30 -08:00
field_conv.cc ER_WARN_DATA_TRUNCATED replaced with WARN_DATA_TRUNCATED. 2005-01-19 16:24:06 +04:00
filesort.cc CSC#4385: slow sorting for UTF8 large table: 2005-01-26 16:34:09 +04:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc Merge with 4.1 2005-01-15 14:09:45 +02:00
ha_berkeley.h
ha_federated.cc Review fixed 2005-02-02 22:39:21 +02:00
ha_federated.h changes to get rid of compile warnings in both ha_federated.cc and ha_federated.h 2005-01-26 11:47:28 -08:00
ha_heap.cc Merge with 4.1 2005-01-15 14:09:45 +02:00
ha_heap.h
ha_innodb.cc Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0 2005-02-04 15:13:45 +01:00
ha_innodb.h Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
ha_myisam.cc
ha_myisam.h Merge changes 2005-02-04 11:59:02 -08:00
ha_myisammrg.cc
ha_myisammrg.h
ha_ndbcluster.cc Merge bk-internal:/home/bk/mysql-5.0 2005-02-04 17:32:18 +01:00
ha_ndbcluster.h Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
handler.cc Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
handler.h Merge changes 2005-02-04 11:59:02 -08:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge changes 2005-02-04 11:59:02 -08:00
item.h Merge changes 2005-02-04 11:59:02 -08:00
item_buff.cc
item_cmpfunc.cc Merge mysql.com:/home/psergey/mysql-4.1-bug7816 2005-02-05 01:52:17 +03:00
item_cmpfunc.h 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item_create.cc Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 2005-01-26 09:05:58 +01:00
item_create.h
item_func.cc Merge bk-internal:/home/bk/mysql-5.0 2005-02-05 07:52:55 -08:00
item_func.h 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item_strfunc.h 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item_subselect.cc Fixed bug detected by sp-tests 2005-02-05 16:05:46 +02:00
item_subselect.h
item_sum.cc Fixes for windows compilation bugs 2005-01-26 15:19:20 +01:00
item_sum.h After merge fixes 2005-01-15 17:38:43 +02:00
item_timefunc.cc Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and 2005-01-28 10:22:50 +03:00
item_timefunc.h Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and 2005-01-28 10:22:50 +03:00
item_uniq.cc
item_uniq.h
key.cc Fixes for windows compilation bugs 2005-01-26 15:19:20 +01:00
lex.h WL#1967 2005-02-01 19:48:05 +00:00
lex_symbol.h
lock.cc added variable NDB_MGM to be able to run the management client in tests 2005-01-20 13:45:42 +01:00
log.cc WL#1062 "log charset info into all Query_log_event": 2005-02-03 16:22:16 +01:00
log_event.cc WL#1062 "log charset info into all Query_log_event": 2005-02-03 16:22:16 +01:00
log_event.h WL#1062 "log charset info into all Query_log_event": 2005-02-03 16:22:16 +01:00
Makefile.am small Makefile.am cleanup 2005-01-28 17:14:03 +01:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-05 18:18:06 +03:00
mysqld.cc Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0 2005-02-04 15:13:45 +01:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments). 2005-02-05 18:16:29 +03:00
opt_range.h
opt_sum.cc
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h After merge fixes 2005-01-15 17:38:43 +02:00
protocol.cc
protocol.h
protocol_cursor.cc
records.cc Merge 2005-01-20 07:51:00 +03:00
repl_failsafe.cc
repl_failsafe.h
set_var.cc Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0 2005-02-04 15:13:45 +01:00
set_var.h Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-03 16:25:57 +01:00
slave.cc WL#1062 "log charset info into all Query_log_event": 2005-02-03 16:22:16 +01:00
slave.h WL#1062 "log charset info into all Query_log_event": 2005-02-03 16:22:16 +01:00
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Fixed bug detected by sp-tests 2005-02-05 16:05:46 +02:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Fixes for windows compilation bugs 2005-01-26 15:19:20 +01:00
sql_acl.h merged 2005-01-24 19:41:42 +01:00
sql_analyse.cc Review fixed 2005-02-02 22:39:21 +02:00
sql_analyse.h
sql_base.cc Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments). 2005-02-05 18:16:29 +03:00
sql_bitmap.h
sql_cache.cc Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
sql_cache.h Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
sql_class.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_class.h 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc merged 2005-01-24 19:41:42 +01:00
sql_delete.cc
sql_derived.cc
sql_do.cc
sql_error.cc
sql_handler.cc
sql_help.cc after review fixup (bug #8129: help.test fails using --ps-protocol) 2005-01-26 16:02:19 +04:00
sql_insert.cc Review fixed 2005-02-02 22:39:21 +02:00
sql_lex.cc Fixed bug detected by sp-tests 2005-02-05 16:05:46 +02:00
sql_lex.h 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_list.cc
sql_list.h
sql_load.cc
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Fixed bug detected by sp-tests 2005-02-05 16:05:46 +02:00
sql_prepare.cc Merge with 4.1 2005-01-15 14:09:45 +02:00
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments). 2005-02-05 18:16:29 +03:00
sql_select.h
sql_show.cc After merge fixes 2005-02-03 18:00:50 +02:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h Merge mysql.com:/home/psergey/mysql-4.1-bug7816 2005-02-05 01:52:17 +03:00
sql_table.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc Merge changes 2005-02-04 11:59:02 -08:00
sql_update.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_view.cc
sql_view.h
sql_yacc.yy resolved merge conflict 2005-02-04 14:27:09 +01:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Fixes for windows compilation bugs 2005-01-26 15:19:20 +01:00
table.h Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-05 18:18:06 +03:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and 2005-01-28 10:22:50 +03:00
tztime.h
udf_example.cc
uniques.cc
unireg.cc
unireg.h
watchdog_mysqld