unknown 50ba314c98 Merge trift2.:/MySQL/M51/mysql-5.1 ... into trift2.:/MySQL/M51/push-5.1 configure.in: Auto merged extra/yassl/src/handshake.cpp: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/src/yassl_imp.cpp: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/handler.cc: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged storage/ndb/src/common/util/OutputStream.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: Auto merged storage/ndb/tools/waiter.cpp: Auto merged		2008-02-22 16:14:27 +01:00
..
examples
share	Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAULT_FOR_FIELD	2008-01-31 14:54:03 +02:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build	2008-02-21 19:53:37 -05:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc	Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows.	2007-12-07 19:27:45 -05:00
event_data_objects.h
event_db_repository.cc	Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitution	2008-02-07 08:47:39 -02:00
event_db_repository.h
event_queue.cc
event_queue.h
event_scheduler.cc
event_scheduler.h
events.cc	Merge mysql.com:/home/gluh/MySQL/Merge/5.1	2007-12-13 15:56:04 +04:00
events.h
field.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-22 15:56:15 -07:00
field.h	merge of bug 33256 5.0-opt -> 5.1-opt	2008-01-08 12:27:15 +02:00
field_conv.cc
filesort.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50	2008-01-30 19:00:46 -07:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc	Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1	2008-02-11 17:38:34 +01:00
ha_ndbcluster.h	Bug #34275 mysqld leak if doing multiple statements within same transaction (or wo/ trans)	2008-02-04 15:40:04 +01:00
ha_ndbcluster_binlog.cc	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc	A pre-requisite for the fix for Bug#12713 "Error in a stored function	2007-12-20 21:16:55 +03:00
ha_partition.h
handler.cc	Merge trift2.:/MySQL/M51/clone-5.1	2008-02-13 13:40:53 +01:00
handler.h	A pre-requisite for the fix for Bug#12713 "Error in a stored function	2007-12-20 21:16:55 +03:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc	Manual merge of Bug 33798	2008-02-08 10:47:25 -02:00
item.h	Merge mysql.com:/home/gluh/MySQL/Merge/5.1	2007-12-13 15:56:04 +04:00
item_buff.cc
item_cmpfunc.cc	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1	2008-01-31 17:46:50 +01:00
item_cmpfunc.h	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2007-12-05 12:33:36 -07:00
item_create.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-14 10:52:10 -05:00
item_create.h
item_func.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-25 10:37:29 -07:00
item_func.h	Merge mysql.com:/home/gluh/MySQL/Merge/5.1	2007-12-13 15:56:04 +04:00
item_geofunc.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-14 10:52:10 -05:00
item_strfunc.h	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2007-12-05 12:33:36 -07:00
item_subselect.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
item_subselect.h
item_sum.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-25 10:37:29 -07:00
item_sum.h	Merge linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united	2007-12-14 12:40:39 +01:00
item_timefunc.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-22 15:56:15 -07:00
item_timefunc.h	Bug #33256: CREATE ... SELECT creates obsolete table	2007-12-21 12:44:24 +02:00
item_xmlfunc.cc
item_xmlfunc.h
key.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
lex.h
lex_symbol.h
lock.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
log.cc	Fixed buffer overflow	2008-02-08 19:37:57 -07:00
log.h
log_event.cc	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
log_event.h	WL#4078: Document binary format of binlog entries	2008-02-07 19:21:23 +01:00
log_event_old.cc	Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl	2008-02-05 14:52:20 +01:00
log_event_old.h
Makefile.am	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h	Applied InnoDB snapshot innodb-5.1-ss2298	2008-02-19 09:44:09 -07:00
mysqld.cc	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
mysqld_suffix.h
net_serv.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
nt_servc.cc
nt_servc.h
opt_range.cc	Merge station.:/mnt/raid/alik/MySQL/devel/5.1	2007-12-14 16:30:22 +03:00
opt_range.h
opt_sum.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc	Merge stella.local:/home2/mydev/mysql-5.1-amain	2007-12-11 21:37:33 +01:00
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
protocol.h	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
records.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-14 10:52:10 -05:00
repl_failsafe.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-22 15:56:15 -07:00
repl_failsafe.h
rpl_constants.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc
rpl_injector.h
rpl_mi.cc
rpl_mi.h
rpl_record.cc	Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAULT_FOR_FIELD	2008-01-31 14:54:03 +02:00
rpl_record.h	Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAULT_FOR_FIELD	2008-01-31 14:54:03 +02:00
rpl_record_old.cc
rpl_record_old.h
rpl_reporting.cc
rpl_reporting.h
rpl_rli.cc	Patch to eliminate some valgrind warnings in debug printout code.	2008-02-11 14:04:30 +03:00
rpl_rli.h	Patch to eliminate some valgrind warnings in debug printout code.	2008-02-11 14:04:30 +03:00
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc	Fixing return value.	2008-01-30 17:35:25 +01:00
rpl_utility.h
scheduler.cc
scheduler.h
set_var.cc	Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build	2008-02-18 23:36:57 +01:00
set_var.h	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl	2007-12-19 18:51:46 +01:00
slave.cc	Disabling declaration of debug variable for non-debug builds.	2008-02-11 14:05:27 +03:00
slave.h	Merge riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.0-rpl	2008-02-06 21:07:45 +01:00
sp.cc	Merge mysql.com:/Users/davi/mysql/bugs/32633-5.1	2008-02-07 16:14:39 -02:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1	2008-02-01 13:55:39 +03:00
sp_head.h	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-25 10:37:29 -07:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc	Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618	2008-01-23 15:36:57 -07:00
sp_rcontext.h	Bug#33618 (Crash in sp_rcontext)	2008-01-23 13:26:41 -07:00
spatial.cc
spatial.h
sql_acl.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2008-02-08 18:55:07 +03:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1	2008-02-01 13:55:39 +03:00
sql_binlog.cc	Various fixes to fix memory leaks after merging replication	2008-02-12 18:21:17 +01:00
sql_bitmap.h	Fix Bug#27812 "an ampersand is missed in sql/sql_bitmap.h, line 68"	2008-01-29 14:14:34 +03:00
sql_builtin.cc.in
sql_cache.cc	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1	2008-02-01 13:55:39 +03:00
sql_cache.h
sql_class.cc	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
sql_class.h	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1	2008-01-31 17:46:50 +01:00
sql_client.cc
sql_connect.cc	Post-merge fix	2008-02-19 14:25:26 +01:00
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc	Merge kaamos.(none):/data/src/mysql-5.1	2008-01-10 20:44:23 +03:00
sql_delete.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-25 10:37:29 -07:00
sql_derived.cc	Bug#12713 "Error in a stored function called from a SELECT doesn't	2007-12-12 18:21:01 +03:00
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-25 10:37:29 -07:00
sql_lex.cc	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge	2007-12-14 13:42:09 -05:00
sql_lex.h	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge	2007-12-14 13:42:09 -05:00
sql_list.cc
sql_list.h
sql_load.cc
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	Bug#31745 - crash handler does not work on Windows	2008-02-19 12:37:39 +01:00
sql_partition.cc	A pre-requisite for the fix for Bug#12713 "Error in a stored function	2007-12-20 21:16:55 +03:00
sql_partition.h
sql_plugin.cc	Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build	2008-02-18 23:36:57 +01:00
sql_plugin.h
sql_prepare.cc	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1	2008-02-01 13:55:39 +03:00
sql_profile.cc
sql_profile.h	Correct complaints of reviewers and clean up test.	2007-12-14 08:57:37 -05:00
sql_rename.cc
sql_repl.cc	Bug #34244 Test ndb_binlog_log_bin fails for 'drop table if	2008-02-03 11:48:45 +01:00
sql_repl.h
sql_select.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-25 10:37:29 -07:00
sql_select.h	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
sql_servers.cc	Bug#12713 "Error in a stored function called from a SELECT doesn't	2007-12-12 18:21:01 +03:00
sql_servers.h
sql_show.cc	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1	2008-02-01 13:55:39 +03:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl	2007-12-19 18:51:46 +01:00
sql_string.h
sql_table.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-25 10:37:29 -07:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1	2008-02-01 13:55:39 +03:00
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc	A pre-requisite for the fix for Bug#12713 "Error in a stored function	2007-12-20 21:16:55 +03:00
sql_update.cc	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-25 10:37:29 -07:00
sql_view.cc	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2008-02-08 18:55:07 +03:00
sql_view.h
sql_yacc.yy	Merge ramayana.hindu.god:/home/tsmith/m/bk/51	2008-01-25 10:37:29 -07:00
stacktrace.c	Merge vvaintroub@bk-internal.mysql.com:/home/bk/mysql-5.1-build	2008-02-21 01:53:35 +01:00
stacktrace.h	Merge vvaintroub@bk-internal.mysql.com:/home/bk/mysql-5.1-build	2008-02-21 01:53:35 +01:00
strfunc.cc
structs.h	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-14 10:52:10 -05:00
table.cc	Merge station.:/mnt/raid/alik/MySQL/devel/5.1	2007-12-14 16:30:22 +03:00
table.h	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint	2007-12-20 22:11:37 +01:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc	Bug#12713 "Error in a stored function called from a SELECT doesn't	2007-12-12 18:21:01 +03:00
tztime.h
udf_example.c
udf_example.def
uniques.cc
unireg.cc	Merge ibm.:/home/alik/Documents/MySQL/devel/5.1	2008-01-19 22:32:48 +03:00
unireg.h