mariadb/sql
unknown 06e82cb855 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bk/b24860-mysql-5.1-rpl


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/slave.cc:
  Auto merged
2007-10-24 16:54:18 +02:00
..
examples
share Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt 2007-09-14 10:37:42 +02:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 2007-08-29 22:29:58 +02:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
event_data_objects.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
event_db_repository.cc Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
event_db_repository.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
event_queue.cc Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
event_queue.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
event_scheduler.cc Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
event_scheduler.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
events.cc Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
events.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
field.cc BUG#29549 (Endians: rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb and rpl_ndb_mix_innodb failed on): 2007-10-12 18:22:31 +02:00
field.h Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 2007-10-12 09:40:24 +02:00
field_conv.cc Fix doxygen warnings. 2007-08-16 21:14:47 +04:00
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc Eliminating some valgrind warnings resulting from that some 2007-10-17 06:50:03 +02:00
ha_ndbcluster.h
ha_ndbcluster_binlog.cc Bug #11313 confusing/erroneous 4006 message 2007-09-07 11:15:07 +02:00
ha_ndbcluster_binlog.h Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 2007-09-11 16:17:28 +02:00
ha_ndbcluster_cond.cc Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 2007-09-13 10:00:14 +02:00
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc Merge bk@192.168.21.1:mysql-5.1-opt 2007-09-10 10:21:55 +05:00
ha_partition.h Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format. 2007-09-07 18:41:49 +05:00
handler.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-08-31 10:58:02 +04:00
handler.h Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format. 2007-09-07 18:41:49 +05:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-09-14 21:17:07 +02:00
item.h Fix compile failure on windows 2007-09-14 21:15:57 +04:00
item_buff.cc
item_cmpfunc.cc Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b31081 2007-10-16 15:04:04 +05:00
item_cmpfunc.h Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b31081 2007-10-16 15:04:04 +05:00
item_create.cc Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-29 16:32:26 +03:00
item_create.h Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
item_func.cc Merge trift2.:/MySQL/M51/target-5.1.22 2007-08-22 16:08:55 +02:00
item_func.h
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-08-14 00:22:34 +03:00
item_strfunc.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-08-14 00:22:34 +03:00
item_subselect.cc Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
item_subselect.h
item_sum.cc Merge mysql.com:/home/psergey/mysql-5.0-bug30324 2007-09-14 15:05:20 +04:00
item_sum.h
item_timefunc.cc BUG#27927:Partition pruning not optimal with TO_DAYS and YEAR functions 2007-09-14 14:18:42 +04:00
item_timefunc.h BUG#27927:Partition pruning not optimal with TO_DAYS and YEAR functions 2007-09-14 14:18:42 +04:00
item_xmlfunc.cc Bug#27287 extractvalue() (and updatexml()) extremely slow for large XML 2007-10-09 13:53:39 +05:00
item_xmlfunc.h
key.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
lex.h
lex_symbol.h
lock.cc Merge moksha.local:/Users/davi/mysql/push/bugs/25164-5.0 2007-08-27 10:19:58 -03:00
log.cc Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 2007-10-12 09:40:24 +02:00
log.h manual merge 2007-10-04 13:13:04 +03:00
log_event.cc Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 2007-10-24 16:54:18 +02:00
log_event.h Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 2007-10-24 16:54:18 +02:00
log_event_old.cc Post-merge fixes, and disable buggy test case on embedded 2007-08-29 16:58:00 -06:00
log_event_old.h Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 2007-08-29 15:28:38 -06:00
Makefile.am
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-08-31 22:13:27 +04:00
mysqld.cc Merge mysql.com:/home/bar/mysql-work/mysql-5.0-rpl 2007-10-02 15:41:43 +05:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc fixed warnings by bug 30639 2007-09-21 12:17:09 +02:00
opt_range.h
opt_sum.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
partition_info.h BUG#27927:Partition pruning not optimal with TO_DAYS and YEAR functions 2007-09-14 14:18:42 +04:00
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
records.cc Eliminating some valgrind warnings resulting from that some 2007-10-17 06:50:03 +02:00
repl_failsafe.cc Renaming MASTER_INFO to Master_info in order to follow the coding 2007-08-16 08:52:50 +02:00
repl_failsafe.h Renaming MASTER_INFO to Master_info in order to follow the coding 2007-08-16 08:52:50 +02:00
rpl_constants.h
rpl_filter.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
rpl_filter.h
rpl_injector.cc
rpl_injector.h
rpl_mi.cc Renaming MASTER_INFO to Master_info in order to follow the coding 2007-08-16 08:52:50 +02:00
rpl_mi.h Renaming MASTER_INFO to Master_info in order to follow the coding 2007-08-16 08:52:50 +02:00
rpl_record.cc Removing debug variables from non-debug builds. 2007-10-17 09:29:11 +02:00
rpl_record.h Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 2007-08-29 15:28:38 -06:00
rpl_record_old.cc Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards 2007-08-16 07:37:50 +02:00
rpl_record_old.h Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards 2007-08-16 07:37:50 +02:00
rpl_reporting.cc
rpl_reporting.h
rpl_rli.cc manual merge for bug_29136, bug#29309. 2007-10-13 23:12:50 +03:00
rpl_rli.h BUG#28618 (Skipping into the middle of a group with SQL_SLAVE_SKIP_COUNTER 2007-10-19 14:18:41 +02:00
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc BUG#30790 : Suspicious code in rpl_utility.cc 2007-09-14 11:22:41 -04:00
rpl_utility.h Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-09-17 12:38:22 +02:00
scheduler.cc
scheduler.h
set_var.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-08-14 00:22:34 +03:00
set_var.h Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
slave.cc Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 2007-10-24 16:54:18 +02:00
slave.h Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 2007-08-29 15:28:38 -06:00
sp.cc Eliminate compile warnings. 2007-09-01 00:12:00 +04:00
sp.h Fix for BUG#25843: changing default database between PREPARE and EXECUTE 2007-08-31 20:42:14 +04:00
sp_cache.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
sp_cache.h
sp_head.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-08-31 22:13:27 +04:00
sp_head.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
sql_acl.h
sql_analyse.cc Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
sql_analyse.h Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
sql_array.h
sql_base.cc Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-08-31 16:04:36 -06:00
sql_binlog.cc Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards 2007-08-16 07:37:50 +02:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074 2007-09-03 13:46:10 +02:00
sql_cache.h Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269 2007-08-17 17:26:38 +02:00
sql_class.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-08-31 22:13:27 +04:00
sql_class.h Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug29136-mdelete 2007-10-13 16:51:16 +03:00
sql_client.cc
sql_connect.cc Bug #30389: connection_id() always return 0 in embedded server 2007-08-27 14:31:27 -06:00
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-08-31 22:13:27 +04:00
sql_delete.cc manual merge for bug_29136, bug#29309. 2007-10-13 23:12:50 +03:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-08-30 13:23:59 -06:00
sql_help.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
sql_insert.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-09-17 12:38:22 +02:00
sql_lex.cc Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-09-19 18:02:59 +03:00
sql_lex.h Merge gleb.loc:/home/uchum/work/bk/5.1 2007-09-13 00:44:50 +05:00
sql_list.cc
sql_list.h
sql_load.cc Merge dl145j.mysql.com:/tmp/andrei/mysql-5.0-rpl 2007-09-15 21:25:56 +02:00
sql_locale.cc
sql_manager.cc
sql_map.cc fixed type conversion warnings revealed by bug 30639 2007-09-21 10:15:16 +02:00
sql_map.h
sql_olap.cc
sql_parse.cc Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug29136-mdelete 2007-10-13 16:51:16 +03:00
sql_partition.cc BUG#27927:Partition pruning not optimal with TO_DAYS and YEAR functions 2007-09-14 14:18:42 +04:00
sql_partition.h
sql_plugin.cc Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
sql_plugin.h
sql_prepare.cc Fix for BUG#25843: changing default database between PREPARE and EXECUTE 2007-08-31 20:42:14 +04:00
sql_rename.cc
sql_repl.cc Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 2007-10-04 12:27:14 +03:00
sql_repl.h Renaming MASTER_INFO to Master_info in order to follow the coding 2007-08-16 08:52:50 +02:00
sql_select.cc fixed type conversion warnings revealed by bug 30639 2007-09-21 10:15:16 +02:00
sql_select.h
sql_servers.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
sql_servers.h
sql_show.cc Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 2007-10-12 13:24:28 +02:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22 2007-08-27 14:01:19 +02:00
sql_string.h
sql_table.cc Merge trift2.:/MySQL/M51/target-5.1.22 2007-08-22 16:08:55 +02:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc Fixed whitespace 2007-09-04 16:40:27 -06:00
sql_trigger.h
sql_udf.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
sql_udf.h
sql_union.cc
sql_update.cc Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug29136-mdelete 2007-10-13 16:51:16 +03:00
sql_view.cc sql_view.cc: 2007-09-13 02:09:29 +05:00
sql_view.h
sql_yacc.yy Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-10-01 11:25:32 +02:00
stacktrace.c
stacktrace.h
strfunc.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
structs.h
table.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 2007-08-16 18:21:47 +02:00
table.h Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
thr_malloc.cc
time.cc re-push of Bug 29536 for 5.1.22: timestamp inconsistent in replication around 1970 2007-08-27 12:33:57 +03:00
tzfile.h
tztime.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
tztime.h
udf_example.c
udf_example.def
uniques.cc
unireg.cc
unireg.h Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22 2007-08-27 14:01:19 +02:00