unknown f72611b4fa After merge fixes ... Added initialization of all important global variables BUILD/SETUP.sh: build with readline client/mysqltest.c: Added variable SERVER_VERSION myisam/mi_key.c: Indentation change myisam/mi_open.c: After merge fix myisam/mi_range.c: After merge fix myisam/mi_rkey.c: After merge fix myisam/mi_search.c: After merge fix myisam/myisamdef.h: After merge fix mysql-test/include/not_embedded.inc: Fix test (because of wrong utf8 test) mysql-test/r/alter_table.result: Updated results after merge mysql-test/r/create.result: Updated results after merge mysql-test/r/ctype_recoding.result: Updated results after merge mysql-test/r/fulltext.result: Updated results after merge mysql-test/r/func_group.result: Updated results after merge mysql-test/r/group_by.result: Updated results after merge mysql-test/r/innodb.result: Updated results after merge mysql-test/r/join_outer.result: Updated results after merge mysql-test/r/null_key.result: Updated results after merge mysql-test/r/order_by.result: Updated results after merge mysql-test/r/query_cache.result: Updated results after merge mysql-test/r/repair.result: Updated results after merge mysql-test/r/rpl_flush_tables.result: Updated results after merge mysql-test/r/union.result: Updated results after merge mysql-test/r/update.result: Updated results after merge mysql-test/t/ansi.test: After merge fixes mysql-test/t/create.test: After merge fixes mysql-test/t/ctype_recoding.test: After merge fixes mysql-test/t/ctype_ujis.test: After merge fixes mysql-test/t/fulltext.test: After merge fixes mysql-test/t/innodb.test: After merge fixes mysql-test/t/join_outer.test: After merge fixes mysql-test/t/loaddata.test: After merge fixes mysql-test/t/order_by.test: After merge fixes mysql-test/t/rpl_flush_tables.test: After merge fixes mysql-test/t/status.test: After merge fixes mysql-test/t/subselect.test: After merge fixes sql/convert.cc: Code cleanup sql/field.cc: After merge fixes sql/filesort.cc: Remove compiler warning sql/item.cc: More efficient set_name() (no mallocs) sql/item_cmpfunc.cc: Code Code cleanup Item_bool_func2::fix_fields() added to get error handling right for cmp_charset sql/item_cmpfunc.h: New prototypes sql/item_func.cc: After merge fix sql/item_strfunc.cc: Faster check for BINARY sql/log_event.cc: Comment cleanup sql/mysql_priv.h: New prototypes and variables sql/mysqld.cc: Added initialization of all important global variables. Cleanup of variable declarations This is needed ot make the embedded version restartable sql/opt_sum.cc: After merge fix sql/set_var.cc: Code cleanup sql/sql_acl.cc: After merge fix Better error message sql/sql_db.cc: After merge fix sql/sql_derived.cc: After merge fix sql/sql_insert.cc: Indentation cleanups sql/sql_list.h: Added empty() to base_ilist sql/sql_parse.cc: After merge fix sql/sql_select.cc: After merge fix Fixed derived name handling in EXPLAIN sql/sql_show.cc: After merge fix sql/sql_string.cc: Made copy_and_convert global sql/sql_string.h: Made copy_and_convert global sql/sql_update.cc: After merge fix sql/sql_yacc.yy: After merge fix sql/thr_malloc.cc: Added sql_strmake_with_convert() sql/unireg.h: Added MAX_ALIAS_NAME strings/ctype-ujis.c: Fixed bug in converting to ujis		2003-05-21 21:39:58 +03:00
..
share	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
.cvsignore
add_errmsg
convert.cc	After merge fixes	2003-05-21 21:39:58 +03:00
custom_conf.h
derror.cc
des_key_file.cc
field.cc	After merge fixes	2003-05-21 21:39:58 +03:00
field.h	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
field_conv.cc
filesort.cc	After merge fixes	2003-05-21 21:39:58 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc
ha_berkeley.h
ha_heap.cc
ha_heap.h	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
ha_innodb.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
ha_innodb.h	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
ha_isam.cc
ha_isam.h
ha_isammrg.cc
ha_isammrg.h
ha_myisam.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
ha_myisam.h
ha_myisammrg.cc
ha_myisammrg.h
handler.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
handler.h	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
item.cc	After merge fixes	2003-05-21 21:39:58 +03:00
item.h
item_buff.cc
item_cmpfunc.cc	After merge fixes	2003-05-21 21:39:58 +03:00
item_cmpfunc.h	After merge fixes	2003-05-21 21:39:58 +03:00
item_create.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
item_create.h
item_func.cc	After merge fixes	2003-05-21 21:39:58 +03:00
item_func.h
item_row.cc
item_row.h
item_strfunc.cc	After merge fixes	2003-05-21 21:39:58 +03:00
item_strfunc.h
item_subselect.cc
item_subselect.h
item_sum.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
item_sum.h	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
item_timefunc.cc
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
log_event.cc	After merge fixes	2003-05-21 21:39:58 +03:00
log_event.h	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
Makefile.am
matherr.c
mf_iocache.cc
mini_client.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
mini_client.h
my_lock.c
mysql_priv.h	After merge fixes	2003-05-21 21:39:58 +03:00
mysqld.cc	After merge fixes	2003-05-21 21:39:58 +03:00
net_serv.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
nt_servc.cc
nt_servc.h
opt_ft.cc
opt_ft.h
opt_range.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
opt_range.h
opt_sum.cc	After merge fixes	2003-05-21 21:39:58 +03:00
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
protocol_cursor.cc
records.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
repl_failsafe.cc
repl_failsafe.h
set_var.cc	After merge fixes	2003-05-21 21:39:58 +03:00
set_var.h	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
slave.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
slave.h
spatial.cc
spatial.h
sql_acl.cc	After merge fixes	2003-05-21 21:39:58 +03:00
sql_acl.h	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
sql_analyse.cc
sql_analyse.h
sql_base.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
sql_cache.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
sql_cache.h
sql_class.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
sql_class.h	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
sql_crypt.cc
sql_crypt.h
sql_db.cc	After merge fixes	2003-05-21 21:39:58 +03:00
sql_delete.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
sql_derived.cc	After merge fixes	2003-05-21 21:39:58 +03:00
sql_do.cc
sql_error.cc
sql_handler.cc
sql_help.cc
sql_insert.cc	After merge fixes	2003-05-21 21:39:58 +03:00
sql_lex.cc
sql_lex.h
sql_list.cc
sql_list.h	After merge fixes	2003-05-21 21:39:58 +03:00
sql_load.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	After merge fixes	2003-05-21 21:39:58 +03:00
sql_prepare.cc
sql_rename.cc
sql_repl.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
sql_repl.h
sql_select.cc	After merge fixes	2003-05-21 21:39:58 +03:00
sql_select.h
sql_show.cc	After merge fixes	2003-05-21 21:39:58 +03:00
sql_sort.h
sql_string.cc	After merge fixes	2003-05-21 21:39:58 +03:00
sql_string.h	After merge fixes	2003-05-21 21:39:58 +03:00
sql_table.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
sql_test.cc
sql_udf.cc
sql_udf.h
sql_union.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
sql_update.cc	After merge fixes	2003-05-21 21:39:58 +03:00
sql_yacc.yy	After merge fixes	2003-05-21 21:39:58 +03:00
stacktrace.c
stacktrace.h
structs.h
table.cc
table.h
thr_malloc.cc	After merge fixes	2003-05-21 21:39:58 +03:00
time.cc	Merge with 4.0.13	2003-05-19 16:35:49 +03:00
udf_example.cc
uniques.cc
unireg.cc
unireg.h	After merge fixes	2003-05-21 21:39:58 +03:00
watchdog_mysqld