mariadb/sql
unknown 2bfeecca15 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-09-23 06:00:50 +02:00
..
examples Additional files for cmake support 2006-08-31 19:52:42 +02:00
share Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 2006-09-18 16:23:45 +05:00
.cvsignore
add_errmsg
client_settings.h
CMakeLists.txt Additional files for cmake support 2006-08-31 19:52:42 +02:00
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-08-30 00:45:33 +04:00
field.h
field_conv.cc
filesort.cc
frm_crypt.cc
gen_lex_hash.cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca 2006-08-23 18:37:04 -04:00
gstream.cc
gstream.h
ha_archive.cc Fixes for crashes and test failures 2006-09-01 14:34:37 +02:00
ha_archive.h
ha_berkeley.cc Bug#20573 2006-08-30 13:20:39 -07:00
ha_berkeley.h
ha_blackhole.cc
ha_blackhole.h
ha_federated.cc
ha_federated.h
ha_heap.cc Bug#20573 2006-08-30 13:20:39 -07:00
ha_heap.h
ha_innodb.cc Bug#20573 2006-08-30 13:20:39 -07:00
ha_innodb.h
ha_myisam.cc Merge april.(none):/home/svoj/devel/bk/mysql-5.0-engines 2006-09-12 18:53:51 +05:00
ha_myisam.h BUG#20256 - LOCK WRITE - MyISAM 2006-09-12 18:25:35 +05:00
ha_myisammrg.cc Bug#20573 2006-08-30 13:20:39 -07:00
ha_myisammrg.h
ha_ndbcluster.cc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 2006-09-18 16:23:45 +05:00
ha_ndbcluster.h
handler.cc Merge april.(none):/home/svoj/devel/bk/mysql-5.0-engines 2006-09-12 18:53:51 +05:00
handler.h Merge april.(none):/home/svoj/devel/bk/mysql-5.0-engines 2006-09-12 18:53:51 +05:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-5.0 2006-09-15 11:52:49 +02:00
item.h Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 2006-09-15 14:14:38 +02:00
item_buff.cc
item_cmpfunc.cc merge fixes 2006-09-18 12:14:27 +02:00
item_cmpfunc.h Merge polly.local:/tmp/20924/bug20294/my50-bug20294 2006-09-13 16:06:59 +04:00
item_create.cc
item_create.h
item_func.cc Merge bk-internal:/home/bk/mysql-5.0 2006-09-18 19:01:07 +04:00
item_func.h Merge bk-internal:/home/bk/mysql-5.0 2006-09-18 19:01:07 +04:00
item_geofunc.cc
item_geofunc.h
item_row.cc BUG#21166: Prepared statement causes signal 11 on second execution 2006-08-24 15:49:12 +04:00
item_row.h
item_strfunc.cc Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my50-bug15583 2006-09-13 15:07:06 +02:00
item_strfunc.h Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 2006-08-31 11:57:36 +02:00
item_subselect.cc BUG#16255: Merge to 5.0 2006-08-24 20:56:28 +04:00
item_subselect.h
item_sum.cc BUG#21477 "memory overruns for certain kinds of subqueries": 2006-09-01 13:23:43 +04:00
item_sum.h
item_timefunc.cc Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-4.1-maint-20987 2006-08-22 14:03:52 +02:00
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc Merge perch.ndb.mysql.com:/home/jonas/src/41-work 2006-09-04 14:45:13 +02:00
log_event.cc Fixed the faulty merge 2006-09-13 19:32:21 +04:00
log_event.h
Makefile.am make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
matherr.c
message.mc make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-5.0 2006-09-15 11:52:49 +02:00
mysqld.cc Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown 2006-09-15 14:27:45 +02:00
mysqld_suffix.h
net_serv.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 2006-09-01 08:53:56 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge chilla.local:/home/mydev/mysql-5.0--main 2006-09-21 10:55:23 +02:00
opt_range.h merge fixes 2006-09-18 12:14:27 +02:00
opt_sum.cc Merge macbook.gmz:/Users/kgeorge/mysql/work/B16792-4.1-opt 2006-09-05 17:09:12 +03:00
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h
protocol.cc Bug#8153 (Stored procedure with subquery and continue handler, wrong result) 2006-08-22 18:58:14 -07:00
protocol.h
records.cc
repl_failsafe.cc
repl_failsafe.h
set_var.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 2006-09-01 03:44:03 +02:00
set_var.h
slave.cc Manual merge 2006-08-23 15:46:57 -06:00
slave.h after merge fix 2006-09-08 16:16:39 +05:00
sp.cc after merge fix 2006-09-07 18:09:49 +05:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc after merge fix 2006-09-07 18:09:49 +05:00
sp_head.h Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains 2006-08-25 15:51:29 +02:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc after merge fix 2006-09-07 18:09:49 +05:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Fix for BUG#21774: Column count doesn't match value count at row x 2006-09-12 17:50:24 +03:00
sql_bitmap.h
sql_cache.cc BUG#21051: RESET QUERY CACHE very slow when query_cache_type=0 2006-08-22 11:47:52 +04:00
sql_cache.h BUG#21051: RESET QUERY CACHE very slow when query_cache_type=0 2006-08-22 11:47:52 +04:00
sql_class.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-08-30 00:45:33 +04:00
sql_class.h Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 2006-09-15 01:26:28 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc
sql_delete.cc Fixed bug #21493: crash for the second execution of a function 2006-09-16 09:50:48 -07:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc Merge bk-internal:/home/bk/mysql-5.0-opt 2006-09-18 12:20:20 +02:00
sql_lex.cc Merge bk-internal:/home/bk/mysql-5.0-opt 2006-09-18 12:20:20 +02:00
sql_lex.h Merge bk-internal:/home/bk/mysql-5.0-opt 2006-09-18 12:20:20 +02:00
sql_list.cc
sql_list.h Fixed bug #16081: row equalities were not taken into 2006-09-01 04:23:04 -07:00
sql_load.cc Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0". 2006-09-05 16:52:05 +02:00
sql_locale.cc
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 2006-09-21 00:05:56 +02:00
sql_prepare.cc Bug#21813 An attacker has the opportunity to bypass query logging, part2 2006-08-30 17:11:00 +02:00
sql_rename.cc
sql_repl.cc Merge perch.ndb.mysql.com:/home/jonas/src/41-work 2006-09-04 13:46:56 +02:00
sql_repl.h after merge fix 2006-09-07 18:09:49 +05:00
sql_select.cc Merge chilla.local:/home/mydev/mysql-5.0--main 2006-09-21 10:55:23 +02:00
sql_select.h
sql_show.cc
sql_sort.h
sql_state.c
sql_string.cc Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913 2006-09-04 07:01:15 +02:00
sql_string.h
sql_table.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 2006-09-01 08:53:56 +02:00
sql_test.cc
sql_trigger.cc Polishing (was the part of original patch for BUG#16899): 2006-08-24 18:48:26 +04:00
sql_trigger.h Polishing (was the part of original patch for BUG#16899): 2006-08-24 18:48:26 +04:00
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc Fixed bug #21493: crash for the second execution of a function 2006-09-16 09:50:48 -07:00
sql_view.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-08-30 00:45:33 +04:00
sql_view.h
sql_yacc.yy Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 2006-09-21 00:05:56 +02:00
stacktrace.c Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx 2006-09-07 00:59:08 +02:00
stacktrace.h Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx 2006-09-07 00:59:08 +02:00
strfunc.cc
structs.h
table.cc Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge 2006-09-07 15:17:46 +05:00
table.h
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
udf_example.c
uniques.cc
unireg.cc
unireg.h
watchdog_mysqld