unknown 73e15f57f8 Merge ... client/mysqltest.c: Auto merged BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged myisam/mi_create.c: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/r/metadata.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/type_enum.result: Auto merged mysql-test/t/grant2.test: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged ndb/src/kernel/blocks/dbacc/Dbacc.hpp: SCCS merged ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: SCCS merged sql/sql_union.cc: DBUG_ASSERT(TRUE) is useless so assume opposite		2005-03-28 23:06:19 +02:00
..
examples
share
.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
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc
ha_berkeley.h
ha_blackhole.cc	Collection of changes per Bar and Serg.	2005-03-24 16:07:56 -08:00
ha_blackhole.h	Collection of changes per Bar and Serg.	2005-03-24 16:07:56 -08:00
ha_federated.cc
ha_federated.h
ha_heap.cc
ha_heap.h
ha_innodb.cc
ha_innodb.h
ha_myisam.cc
ha_myisam.h
ha_myisammrg.cc
ha_myisammrg.h
ha_ndbcluster.cc
ha_ndbcluster.h
handler.cc	Merging support for blackhole up to 5.0.	2005-03-25 10:36:58 -08:00
handler.h	Fix upgrade/downgrade issue.	2005-03-25 12:36:04 -08:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc
item.h
item_buff.cc
item_cmpfunc.cc
item_cmpfunc.h
item_create.cc
item_create.h
item_func.cc	item_func.cc:	2005-03-28 14:15:43 +05:00
item_func.h	Merge	2005-03-25 10:43:35 +04:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc
item_strfunc.h	Merge	2005-03-25 10:43:35 +04:00
item_subselect.cc
item_subselect.h
item_sum.cc
item_sum.h
item_timefunc.cc
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc
log_event.cc	WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.	2005-03-25 14:51:17 +01:00
log_event.h	WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.	2005-03-25 14:51:17 +01:00
Makefile.am	Merging support for blackhole up to 5.0.	2005-03-25 10:36:58 -08:00
matherr.c
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h	Merging support for blackhole up to 5.0.	2005-03-25 10:36:58 -08:00
mysqld.cc	Manual merge	2005-03-26 01:44:54 +03:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc
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	Merging support for blackhole up to 5.0.	2005-03-25 10:36:58 -08:00
set_var.h
slave.cc	merge from 4.1	2005-03-24 14:32:40 +01:00
slave.h	merge from 4.1	2005-03-24 14:32:40 +01:00
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc	Merge	2005-03-28 23:06:19 +02:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_base.cc
sql_bitmap.h
sql_cache.cc
sql_cache.h
sql_class.cc
sql_class.h
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc
sql_delete.cc
sql_derived.cc
sql_do.cc
sql_error.cc
sql_handler.cc
sql_help.cc
sql_insert.cc
sql_lex.cc
sql_lex.h
sql_list.cc
sql_list.h
sql_load.cc	WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.	2005-03-25 14:51:17 +01:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	fixes for "backport wild_compare fix from 4.1 - bug#3924"	2005-03-26 19:46:42 +01:00
sql_prepare.cc
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc	Bug #9317: Wrong count for tables in INFORMATION_SCHEMA	2005-03-24 16:32:11 +03:00
sql_select.h
sql_show.cc	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-03-25 15:09:22 +03:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc	Merge	2005-03-28 23:06:19 +02:00
sql_update.cc
sql_view.cc
sql_view.h
sql_yacc.yy
stacktrace.c
stacktrace.h
strfunc.cc
structs.h	merge from 4.1	2005-03-24 14:32:40 +01:00
table.cc
table.h	Bug #9317: Wrong count for tables in INFORMATION_SCHEMA	2005-03-24 16:32:11 +03:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
udf_example.cc
uniques.cc
unireg.cc
unireg.h
watchdog_mysqld