unknown dc3dc9a1ba Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 ... into moonbone.local:/work/tmp_merge-5.0-opt-mysql configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/item_func.cc: Auto merged sql/sql_lex.cc: Auto merged tests/mysql_client_test.c: Auto merged		2006-06-19 01:16:18 +04:00
..
examples
share	Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX	2006-05-30 00:08:58 -07:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc	Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt	2006-06-15 18:36:46 -07:00
field.h	Bug #18895: BIT values cause joins to fail	2006-06-14 15:57:23 +03:00
field_conv.cc
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_archive.cc	Manually merged	2006-06-17 02:57:50 +04:00
ha_archive.h
ha_berkeley.cc
ha_berkeley.h
ha_blackhole.cc
ha_blackhole.h
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	Bug#19648	2006-05-30 17:10:53 -07:00
ha_ndbcluster.cc	Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0	2006-06-14 20:27:32 +02:00
ha_ndbcluster.h	Merge mysql.com:/home/marty/MySQL/mysql-4.1	2006-06-09 12:07:04 +02:00
handler.cc
handler.h	Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table	2006-06-02 07:26:45 +02:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc
item.h	Manually merged	2006-06-14 23:54:08 +04:00
item_buff.cc	Fix for bug#19667 group by a decimal expression yields wrong result	2006-06-15 16:24:02 +05:00
item_cmpfunc.cc	Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt	2006-06-17 01:57:25 +04:00
item_cmpfunc.h	item_cmpfunc.h, cast.result:	2006-06-15 16:39:18 +04:00
item_create.cc
item_create.h
item_func.cc	Manually merged	2006-06-17 02:57:50 +04:00
item_func.h
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc	Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt	2006-06-17 01:57:25 +04:00
item_strfunc.h	Bug#19599 duplication of information_schema column value in a CONCAT expr with user var	2006-06-06 12:51:04 +05:00
item_subselect.cc
item_subselect.h
item_sum.cc
item_sum.h
item_timefunc.cc	Manually merged	2006-06-17 02:11:12 +04:00
item_timefunc.h	Manually merged	2006-06-17 02:11:12 +04:00
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc
log_event.cc
log_event.h
Makefile.am	Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init	2006-05-31 16:19:06 +02:00
matherr.c
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h	Merge mysql.com:/home/kgeorge/mysql/5.0/clean	2006-05-26 11:51:30 +03:00
mysqld.cc	Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c	2006-05-31 14:27:31 +02:00
mysqld_suffix.h
net_serv.cc	configure.in, net_serv.cc, compile-netware-END:	2006-06-17 00:30:02 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc	Merge mysql.com:/home/kgeorge/mysql/4.1/B4981	2006-06-02 15:35:40 +03:00
opt_range.h
opt_sum.cc	Merge rurik.mysql.com:/home/igor/mysql-4.1-opt	2006-06-15 18:40:18 -07:00
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
records.cc
repl_failsafe.cc
repl_failsafe.h
set_var.cc
set_var.h
slave.cc
slave.h
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 neptunus.(none):/home/msvensson/mysql/mysql-5.0	2006-05-29 15:06:37 +02:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc	Manually merged	2006-06-17 00:58:36 +04:00
sql_bitmap.h
sql_cache.cc
sql_cache.h
sql_class.cc	after-merge fixes.	2006-06-16 14:05:58 +05:00
sql_class.h	after-merge fixes.	2006-06-16 14:05:58 +05:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc	Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock	2006-05-29 15:26:23 +02:00
sql_delete.cc	BUG#18681: View privileges are broken	2006-05-26 11:47:53 +03:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc	Bug #20195: INSERT DELAYED with auto_increment is assigned wrong values	2006-06-13 18:18:32 +03:00
sql_lex.cc	Merge bk-internal:/home/bk/mysql-5.0	2006-06-02 21:41:57 +02:00
sql_lex.h	Manually merged	2006-06-17 00:58:36 +04:00
sql_list.cc
sql_list.h
sql_load.cc	BUG#18681: View privileges are broken	2006-05-26 11:47:53 +03:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	Bug #20363: Create view on just created view is now denied	2006-06-12 18:15:08 +03:00
sql_prepare.cc
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc	Merge rurik.mysql.com:/home/igor/mysql-4.1-opt	2006-06-02 17:06:10 -07:00
sql_select.h	Merge rurik.mysql.com:/home/igor/mysql-4.1-opt	2006-06-02 17:06:10 -07:00
sql_show.cc	Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1	2006-06-06 11:25:31 +05:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc	BUG#19192 - CHECK TABLE EXTENDED / REPAIR TABLE show no errors.	2006-06-01 18:08:57 +05:00
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc	BUG#18681: View privileges are broken	2006-05-26 11:47:53 +03:00
sql_view.cc
sql_view.h
sql_yacc.yy	Fixed bug#18175: The nest_level counter wasn't decremented for union parts which	2006-06-15 22:09:58 +04:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h	Manually merged	2006-06-14 23:54:08 +04:00
table.cc	Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0	2006-06-02 22:31:51 +03:00
table.h
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
udf_example.cc
uniques.cc
unireg.cc
unireg.h
watchdog_mysqld