mariadb/sql
unknown 189b8bc531 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into  zim.(none):/home/brian/mysql/remove-bdb-5.1


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2006-08-10 13:44:04 -07:00
..
share Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge 2006-08-09 16:42:21 +04:00
.cvsignore
add_errmsg
authors.h update show authors 2006-05-30 10:22:31 +02:00
client_settings.h
CMakeLists.txt Add sql_locale.cc to cmake scripts. 2006-07-28 16:37:16 +04:00
contributors.h Added new show contributors command. 2006-05-02 17:53:26 -07:00
custom_conf.h
derror.cc
des_key_file.cc
discover.cc sql/Makefile.am: better mysqld dependencies 2006-05-30 18:21:03 +02:00
event_scheduler.cc manual merge 2006-06-20 17:14:36 +02:00
event_scheduler.h Reorganize, physically the events code 2006-06-08 23:07:11 +02:00
event_timed.cc After merge fixes. 2006-07-07 03:07:45 +04:00
event_timed.h forgot to event_timed.h 2006-06-20 17:05:41 +02:00
events.cc Another post-merge fix. 2006-07-07 13:49:43 +04:00
events.h Reorganize, physically the events code 2006-06-08 23:07:11 +02:00
events_priv.h Reorganize, physically the events code 2006-06-08 23:07:11 +02:00
field.cc Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 2006-08-09 13:37:20 +04:00
field.h Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 2006-08-08 09:01:32 -07:00
field_conv.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-15 01:04:51 +04:00
filesort.cc Added purecov comment for new, not executed code for my recent changeset 2006-06-28 14:03:08 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_federated.cc Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 2006-08-08 09:01:32 -07:00
ha_federated.h Bug#20942 ha_federated uses String::append(const char *s), strlen() on every call 2006-08-02 12:36:01 +02:00
ha_heap.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_heap.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_innodb.cc Make innodb_flush_log_at_trx_commit a settable global variable. 2006-07-29 07:17:33 +04:00
ha_innodb.h Make innodb_flush_log_at_trx_commit a settable global variable. 2006-07-29 07:17:33 +04:00
ha_myisam.cc Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2006-08-04 14:48:51 +04:00
ha_myisam.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_myisammrg.cc Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 2006-08-08 09:01:32 -07:00
ha_myisammrg.h Merge mysql.com:/home/mydev/mysql-5.0-amerge 2006-06-15 10:58:02 +02:00
ha_ndbcluster.cc Post-merge fixes. 2006-07-14 02:07:37 +04:00
ha_ndbcluster.h Merge dator5.(none):/home/pappa/clean-mysql-5.1 2006-07-01 00:19:23 -04:00
ha_ndbcluster_binlog.cc Bug #20843 tests fails randomly with assertion in completeClusterFailed 2006-07-08 03:26:13 +02:00
ha_ndbcluster_binlog.h sql_delete.cc: 2006-06-12 14:23:21 +02:00
ha_ndbcluster_tables.h Bug #17805 Cluster_replication database should be renamed to just cluster 2006-03-01 13:31:21 +01:00
ha_partition.cc Merge dator5.(none):/home/pappa/clean-mysql-5.1 2006-07-15 04:06:31 -04:00
ha_partition.h Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 2006-07-15 03:59:53 -04:00
handler.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 2006-08-10 13:44:04 -07:00
handler.h Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2006-08-04 14:48:51 +04:00
hash_filo.cc
hash_filo.h
hostname.cc Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
init.cc WL#1324 table name to file name encoding 2005-12-31 09:01:26 +04:00
item.cc After merge fix 2006-08-01 08:49:43 +04:00
item.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +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 sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_cmpfunc.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_create.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
item_create.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
item_func.cc Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_func.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_geofunc.cc Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-31 11:54:36 +02:00
item_geofunc.h Merge mysql.com:/home/mydev/mysql-4.1-bug14400 2006-07-05 11:20:10 +02:00
item_row.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
item_row.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
item_strfunc.cc Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_strfunc.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_subselect.cc Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_subselect.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_sum.cc Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_sum.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
item_timefunc.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
item_timefunc.h Manually merged 2006-06-18 14:56:35 +04:00
item_uniq.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
item_uniq.h Inefficient usage of String::append() fixed. 2005-11-20 20:47:07 +02:00
item_xmlfunc.cc Post-merge fixes. 2006-07-14 02:07:37 +04:00
item_xmlfunc.h BUG#18198: Many strange partition functions were allowed, now only strictly allowed functions are ok 2006-05-31 13:32:14 -04:00
key.cc Bug#20086: Can't get data from key partitioned tables with VARCHAR key 2006-06-21 13:00:19 +05:00
lex.h This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 2006-08-10 01:50:37 -07:00
lex_symbol.h
lock.cc Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge 2006-07-04 10:02:11 +02:00
log.cc Fix Bug #18559 "log tables cannot change engine, and 2006-08-03 21:28:15 +04:00
log.h Fix Bug #18559 "log tables cannot change engine, and 2006-08-03 21:28:15 +04:00
log_event.cc Post-merge fixes. 2006-07-13 17:34:49 +04:00
log_event.h Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 2006-07-03 11:35:58 -04:00
Makefile.am Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 2006-08-10 13:44:04 -07:00
matherr.c
message.mc Some changes to make it possible to build for Windows with CMake from 2006-03-24 22:50:56 +01:00
mf_iocache.cc
my_decimal.cc Moved long running query to type_newdecimal-big.test 2005-11-23 20:16:06 +02:00
my_decimal.h Fix for bug #13573 (wrong data inserted for too big decimals) 2005-10-15 21:57:32 +05:00
my_lock.c Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
mysql_priv.h This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 2006-08-10 01:50:37 -07:00
mysqld.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 2006-08-10 13:44:04 -07: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 epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2006-08-01 09:24:19 +04:00
opt_range.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
opt_sum.cc Merge mysql.com:/home/mydev/mysql-4.1-bug11824 2006-07-05 11:11:40 +02:00
parse_file.cc Merge zim.(none):/home/ian/workspace/mysql-5.0 2006-03-27 19:48:44 -08:00
parse_file.h Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created 2006-03-28 01:01:51 +04:00
partition_element.h Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 2006-06-14 09:12:07 -04:00
partition_info.cc partition functions to pass create_info, not only max_rows 2006-06-27 22:19:27 +02:00
partition_info.h partition functions to pass create_info, not only max_rows 2006-06-27 22:19:27 +02:00
password.c Fixed compiler and valgrind warnings 2006-03-29 14:27:36 +03:00
procedure.cc
procedure.h String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
protocol.cc String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
protocol.h Fixes to embedded server to be able to run tests with it 2006-02-24 18:34:15 +02:00
records.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
repl_failsafe.cc fix for bug #17619 Scheduler race conditions 2006-05-22 20:46:13 +02:00
repl_failsafe.h
rpl_filter.cc Fixes for Windows compilation failures. 2006-07-07 16:14:07 +04:00
rpl_filter.h Fixes for Windows compilation failures. 2006-07-07 16:14:07 +04:00
rpl_injector.cc Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2 2006-06-23 15:05:15 +02:00
rpl_injector.h Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2 2006-06-23 15:05:15 +02:00
rpl_rli.h Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2006-06-07 23:58:08 +04:00
rpl_tblmap.cc WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_tblmap.h Compile fixes for aix52-64bit. 2006-01-01 22:18:02 +01:00
set_var.cc This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 2006-08-10 01:50:37 -07:00
set_var.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
slave.cc slave.cc: 2006-07-25 20:00:18 +09:30
slave.h A fix for Bug#19022 "Memory bug when switching db during trigger execution". 2006-06-28 23:47:45 +04:00
sp.cc Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 2006-08-09 13:37:20 +04:00
sp.h Bug#21039 Transaction cache not flushed after SELECT CREATE 2006-07-26 12:40:26 +02:00
sp_cache.cc Remove unused variable 2006-03-28 19:34:44 +02:00
sp_cache.h
sp_head.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-15 01:04:51 +04:00
sp_head.h Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl 2006-07-11 12:17:19 +02:00
sp_pcontext.cc Fixed BUG#18949: Test case sp-goto is disabled 2006-04-18 11:07:34 +02:00
sp_pcontext.h Fixed BUG#18949: Test case sp-goto is disabled 2006-04-18 11:07:34 +02:00
sp_rcontext.cc BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes(). 2006-05-15 12:01:55 +02:00
sp_rcontext.h BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes(). 2006-05-15 12:01:55 +02:00
spatial.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
spatial.h gcc 4.1 linux warning fixes backported from 5.0. 2006-06-28 16:28:29 +03:00
sql_acl.cc Merge rama.(none):/home/jimw/my/tmp_merge 2006-07-28 15:51:48 -07:00
sql_acl.h Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge 2006-05-11 11:28:56 +04:00
sql_analyse.cc String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
sql_analyse.h String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
sql_array.h
sql_base.cc Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 2006-08-10 12:10:48 +04:00
sql_binlog.cc fixed BINLOG crashes in case of badly formed statement (Bug #17457) 2006-03-01 12:45:13 +02:00
sql_bitmap.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_builtin.cc.in WL#3201 2006-04-13 13:49:29 -07:00
sql_cache.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
sql_cache.h Fixed compiler warnings from gcc 4.0.2: 2006-02-25 17:46:30 +02:00
sql_class.cc Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 2006-08-09 13:37:20 +04:00
sql_class.h Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 2006-08-09 13:37:20 +04:00
sql_client.cc
sql_crypt.cc unsigned char -> uchar 2006-06-19 12:45:34 +03:00
sql_crypt.h
sql_cursor.cc Fixed BUG#15758: "Holding adaptive search latch in 2006-04-07 23:58:17 +04:00
sql_cursor.h
sql_db.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-13 11:43:52 +04:00
sql_delete.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
sql_derived.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
sql_do.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_error.cc Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 2006-03-23 18:14:02 +01:00
sql_error.h fix for bug #17619 Scheduler race conditions 2006-05-22 20:46:13 +02:00
sql_handler.cc Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge 2006-07-04 10:02:11 +02:00
sql_help.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_insert.cc Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-b 2006-08-03 10:18:04 +02:00
sql_lex.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-15 01:04:51 +04:00
sql_lex.h Merge sunlight.local:/local_work/leak_fix_orig 2006-08-09 02:49:29 +04:00
sql_list.cc
sql_list.h WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
sql_load.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-07-13 00:18:59 +04:00
sql_locale.cc Backporting Kostja's changes made for 5.0 into 4.1. 2006-07-18 15:53:12 +05:00
sql_manager.cc Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
sql_manager.h Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
sql_map.cc Bug fix for bug #15843 "Added mmap support in myisam creates compile problem 2005-12-19 14:16:21 +01:00
sql_map.h
sql_olap.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_parse.cc Post-merge fix. 2006-08-09 16:37:26 +04:00
sql_partition.cc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-07-29 23:54:55 +04:00
sql_partition.h partition functions to pass create_info, not only max_rows 2006-06-27 22:19:27 +02:00
sql_plugin.cc Bug#20168 2006-06-12 06:50:11 -07:00
sql_plugin.h Bug#20168 2006-06-12 06:50:11 -07:00
sql_prepare.cc Merge rama.(none):/home/jimw/my/tmp_merge 2006-07-28 15:51:48 -07:00
sql_rename.cc Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 2006-02-27 20:00:07 +03:00
sql_repl.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_repl.h WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
sql_select.cc Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 2006-08-09 13:37:20 +04:00
sql_select.h BUG#14940 "MySQL choose wrong index", v.2 2006-07-28 21:27:01 +04:00
sql_show.cc Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
sql_show.h WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
sql_sort.h
sql_state.c
sql_string.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-19 13:00:36 +03:00
sql_string.h Bug#19006: 4.0 valgrind problems (in test func_str) 2006-07-01 14:31:52 -04:00
sql_table.cc Fix windows pushbuild failure: the bug occured because 2006-08-08 12:03:24 +04:00
sql_tablespace.cc Bug#20168 2006-06-12 06:50:11 -07:00
sql_test.cc Merge mysql.com:/home/my/mysql-5.0 2006-05-04 22:27:12 +03:00
sql_trigger.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-13 11:43:52 +04:00
sql_trigger.h After merge fixes for patch solving bug#18437 "Wrong values inserted with a 2006-07-06 13:33:23 +04:00
sql_udf.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
sql_udf.h Fix compiler warnings in sql_udf.h: ISO C++ forbids casting 2006-07-09 13:03:51 +04:00
sql_union.cc BUG#17138: Crashes in stored procedure 2006-07-01 00:01:37 -04:00
sql_update.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
sql_view.cc Merge sunlight.local:/local_work/leak_fix_orig 2006-08-09 02:49:29 +04:00
sql_view.h Merge sunlight.local:/local_work/leak_fix_orig 2006-08-09 02:49:29 +04:00
sql_yacc.yy This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 2006-08-10 01:50:37 -07:00
stacktrace.c
stacktrace.h
strfunc.cc Making old tables seen with "#mysql50#" prefix, 2005-12-31 12:34:39 +04:00
structs.h WL#3146 "less locking in auto_increment": 2006-07-09 17:52:19 +02:00
table.cc sql_base.cc, table.cc: 2006-08-10 00:37:08 +04:00
table.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-08-01 20:52:21 +04:00
thr_malloc.cc
time.cc Bug#20729: Bad date_format() call makes mysql server crash 2006-07-11 13:06:29 -04:00
tzfile.h
tztime.cc Merge bodhi.netgear:/opt/local/work/tmp_merge 2006-07-06 22:55:48 +04:00
tztime.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-05-02 18:41:42 -04:00
udf_example.c udf_example.c, udf.test, Makefile.am: 2006-07-29 04:41:50 +02:00
uniques.cc many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
unireg.cc Merge bk-internal:/home/bk/mysql-5.1 2006-07-19 08:57:52 +02:00
unireg.h Merge sunlight.local:/local_work/leak_fix_orig 2006-08-09 02:49:29 +04:00