mariadb/sql
mskold@mysql.com 5e4df23c96 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
2006-02-15 12:52:30 +01:00
..
share post-merge fixes of bug 16548 2006-02-14 20:10:51 +01:00
.cvsignore
add_errmsg
authors.h Finalize storage engine plugins 2005-12-21 10:18:40 -08:00
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc Many files: 2005-09-30 14:03:55 +02:00
discover.cc WL#1324 table name to file name encoding 2005-12-31 09:01:26 +04:00
event.cc post-merge fixes of bug 16548 2006-02-14 20:10:51 +01:00
event.h manual merge 2006-02-14 17:05:36 +01:00
event_executor.cc make it explicitly extern. this should fix build failure on FC4 2006-02-14 20:58:19 +01:00
event_priv.h - final fixes for bug#16431 (Events: An event which alters itself disappears) 2006-02-14 16:20:48 +01:00
event_timed.cc manual merge 2006-02-14 17:05:36 +01:00
field.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 00:02:56 +03:00
field.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
field_conv.cc Fix for bug#11491 Misleading error message if not NULL column set to NULL, 2005-12-01 15:30:11 +04:00
filesort.cc Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects 2005-10-14 00:04:52 +03:00
frm_crypt.cc
gen_lex_hash.cc a fix (#10742: Can't compile "sql_lex.cc" on AIX 5.2). 2005-05-19 18:56:01 +05:00
gstream.cc fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
gstream.h
ha_archive.cc Fix for bad merge. 2006-02-13 10:21:33 -08:00
ha_archive.h Merge zim.tangent.org:/home/brian/mysql/mysql-5.0 2006-02-13 04:22:05 -08:00
ha_berkeley.cc WL#1359 NDB: Add table handler and table information available from SQL commands 2006-01-28 16:16:23 +13:00
ha_berkeley.h Merge mysql.com:/home/jimw/my/mysql-5.1-14880 2005-12-05 18:09:42 -08:00
ha_blackhole.cc WL#1359 NDB: Add table handler and table information available from SQL commands 2006-01-28 16:16:23 +13:00
ha_blackhole.h BUG#15406: Adding support for transactions to blackhole. 2005-12-02 01:11:49 +01:00
ha_federated.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 00:33:31 +03:00
ha_federated.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 00:33:31 +03:00
ha_heap.cc Merge mysql.com:/home/kostja/mysql/tmp_merge1 2006-02-09 00:21:22 +03:00
ha_heap.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 23:53:45 +03:00
ha_innodb.cc This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 2006-02-12 13:26:30 -08:00
ha_innodb.h Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582. 2006-01-31 21:41:48 +03:00
ha_myisam.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-11 17:26:32 -08:00
ha_myisam.h Fix the tree: plugin-related changes, necessary for 2006-01-20 00:40:56 +03:00
ha_myisammrg.cc WL#1359 NDB: Add table handler and table information available from SQL commands 2006-01-28 16:16:23 +13:00
ha_myisammrg.h Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_ndbcluster.cc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-14 11:51:44 +01:00
ha_ndbcluster.h Bug #17340 SHOW CREATE TABLE from second session crashes the server 2006-02-13 21:55:49 +01:00
ha_ndbcluster_binlog.cc Bug #17188 CRBR: ignores --binlog_ignore_db= settings 2006-02-07 19:02:38 +01:00
ha_ndbcluster_binlog.h Bug #17038, distribution of schema operation to multiple binlogs missing/multiple entries, partial fix 2006-02-06 11:47:12 +01:00
ha_ndbcluster_tables.h wl2325 wl2324 2006-01-12 19:51:02 +01:00
ha_partition.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-11 17:26:32 -08:00
ha_partition.h WL# 2986 2006-01-28 16:22:32 -08:00
handler.cc Merge mysql.com:/home/mydev/mysql-5.1 2006-02-10 20:00:22 +01:00
handler.h Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-14 11:51:44 +01:00
handlerton-win.cc Makefile.am: 2005-11-26 05:35:37 +01:00
handlerton.cc.in Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
hash_filo.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
hash_filo.h forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliures 2005-05-27 14:15:08 +02:00
hostname.cc Backport of JimW's localhost patch to 4.1 tree. 2005-09-02 17:07:05 -07:00
init.cc WL#1324 table name to file name encoding 2005-12-31 09:01:26 +04:00
item.cc Fix merge (5.0 -> 5.1) of the patch for BUG#15166/15196. 2006-02-06 16:05:20 +03:00
item.h Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rev-1.2004.2.1 2006-02-06 15:23:17 +03:00
item_buff.cc sql_select.cc: 2005-07-25 12:57:23 -07:00
item_cmpfunc.cc Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 2006-02-14 20:48:34 +02:00
item_cmpfunc.h Merge mysql.com:/opt/local/work/mysql-4.1-12734 2006-01-14 19:12:07 +03:00
item_create.cc Adding XPath support: ExtractValue and UpdateXML functions. 2005-12-21 17:13:52 +04:00
item_create.h Adding XPath support: ExtractValue and UpdateXML functions. 2005-12-21 17:13:52 +04:00
item_func.cc Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 2006-02-09 13:35:59 +03:00
item_func.h Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1 2006-02-07 15:30:32 +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 neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
item_row.cc Fixed bug #12762: 2005-10-15 14:32:37 -07:00
item_row.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_strfunc.cc Merge mysql.com:/opt/local/work/mysql-4.1-root 2006-01-11 17:49:56 +03:00
item_strfunc.h BUG#9535 Warning for "create table t as select uuid();" 2005-12-07 15:45:31 +01:00
item_subselect.cc Merge mysql.com:/home/jimw/my/mysql-5.0-clean 2005-12-12 11:57:07 -08:00
item_subselect.h A fix and a test case for Bug#12736 "Server crash during a select". 2005-10-13 11:53:00 +04:00
item_sum.cc WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
item_sum.h item_sum.h, item.cc: 2005-12-11 22:21:19 -08:00
item_timefunc.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 14:05:19 +03:00
item_timefunc.h - fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON) 2006-01-18 20:41:22 +01: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 Fix -ansi -pedantic compile 2006-01-05 11:18:26 +03:00
item_xmlfunc.h Adding XPath support: ExtractValue and UpdateXML functions. 2005-12-21 17:13:52 +04:00
key.cc Merge mysql.com:/home/my/mysql-5.1 2005-11-23 22:58:53 +02:00
lex.h Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-11 17:26:32 -08:00
lex_symbol.h
lock.cc Fix the tree: plugin-related changes, necessary for 2006-01-20 00:40:56 +03:00
log.cc Merge 2006-02-12 20:45:03 +01:00
log.h Merge 2006-02-12 20:45:03 +01:00
log_event.cc Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 2006-02-14 20:48:34 +02:00
log_event.h Back out errorneous Windows fix. 2006-01-20 13:17:55 +01:00
Makefile.am make clean generated as appropriate 2006-01-20 12:54:34 +01:00
matherr.c
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
mysql_priv.h Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-13 11:53:56 +04:00
mysqld.cc Many files: 2006-02-14 08:24:01 +04:00
mysqld_suffix.h
net_serv.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-09-12 17:00:50 -07:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 2006-02-09 13:35:59 +03:00
opt_range.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
opt_sum.cc Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 2006-01-06 23:26:20 -08:00
parse_file.cc Fix for crash of "mysql-test-run --debug mysqldump": don't access dir->str if dir is null. 2006-01-24 15:37:56 +01:00
parse_file.h Inefficient usage of String::append() fixed. 2005-11-20 20:47:07 +02:00
password.c Merge mysql.com:/opt/local/work/mysql-4.1-root 2006-01-11 17:49:56 +03:00
procedure.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
procedure.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
protocol.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 23:27:06 +03:00
protocol.h Big patch to make embedded-server working in 5.x 2006-01-04 14:20:28 +04:00
records.cc Many files: 2005-12-01 13:34:48 +01:00
repl_failsafe.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
repl_failsafe.h pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
rpl_filter.cc Fix for BUG#15018 "valgrind error in Rpl_filter (uninitalized memory - could crash)". 2005-11-17 15:58:55 +01:00
rpl_filter.h WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_injector.cc wl2325 wl2324 2006-01-12 19:51:02 +01:00
rpl_injector.h wl2325 wl2324 2006-01-12 19:51:02 +01:00
rpl_rli.h WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01: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 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 2006-02-14 08:25:09 +04:00
set_var.h Many files: 2006-02-14 08:24:01 +04:00
slave.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
slave.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sp.cc Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 2006-02-09 13:35:59 +03:00
sp.h Fixed BUG#16303: erroneus stored procedures and functions should be droppable 2006-01-26 13:29:46 +01:00
sp_cache.cc Fix use of "%*s" *printf() specifiers that were really meant to be 2005-10-06 17:37:24 -07:00
sp_cache.h BUG#12228: Post review fixes: Added test case, code cleanup. 2005-08-10 21:17:02 +00:00
sp_head.cc Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 2006-02-09 13:35:59 +03:00
sp_head.h Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 2006-02-09 13:35:59 +03:00
sp_pcontext.cc Patch for WL#2894: Make stored routine variables work 2005-12-07 17:01:17 +03:00
sp_pcontext.h Merge mysql.com:/extern/mysql/bk/mysql-5.0 2006-01-16 15:37:25 +01:00
sp_rcontext.cc Post-review fix for BUG#15011. 2006-02-01 16:00:11 +01:00
sp_rcontext.h Patch for WL#2894: Make stored routine variables work 2005-12-07 17:01:17 +03:00
spatial.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0 2005-11-21 21:15:48 +02:00
spatial.h Merging 2006-01-21 18:50:06 +04:00
sql_acl.cc make declarations of mysql_db_table_last_check and mysql_db_table_fields 2006-02-14 22:21:23 +01:00
sql_acl.h manual merge 2006-02-14 17:05:36 +01:00
sql_analyse.cc Inefficient usage of String::append() fixed. 2005-11-20 20:47:07 +02:00
sql_analyse.h Merge from 4.1 2005-05-26 21:01:55 +02:00
sql_array.h Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04:00
sql_base.cc Bug #17179 schema creation fails 2006-02-13 20:34:36 +01:00
sql_binlog.cc WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
sql_bitmap.h merge 2005-07-20 00:40:49 +02:00
sql_cache.cc Merge mysql.com:/opt/local/work/mysql-5.0-merge 2006-01-05 00:38:51 +03:00
sql_cache.h Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2005-11-23 14:57:00 +02:00
sql_class.cc Many files: 2006-02-14 08:24:01 +04:00
sql_class.h Many files: 2006-02-14 08:24:01 +04:00
sql_client.cc
sql_crypt.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_crypt.h Add ifdefs to control when "#pragma implementation" should be used 2005-05-26 12:09:14 +02:00
sql_cursor.cc Big patch to make embedded-server working in 5.x 2006-01-04 14:20:28 +04:00
sql_cursor.h A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
sql_db.cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-13 11:53:56 +04:00
sql_delete.cc WL#2985 "Partition pruning", "do pruning for UPDATE/DELETE": Post-merge fixes 2006-02-06 18:33:39 +03:00
sql_derived.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
sql_do.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_error.cc Additional fix for BUG#7049, after review. 2005-10-17 15:07:47 +02:00
sql_error.h
sql_handler.cc Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge 2006-02-02 12:03:35 +03:00
sql_help.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sql_insert.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sql_lex.cc Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 2006-02-09 13:35:59 +03:00
sql_lex.h Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-13 11:53:56 +04:00
sql_list.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_list.h WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
sql_load.cc Bug#17081 LOAD DATA INFILE" may not load all the data 2006-02-07 11:47:04 +01: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 Add ifdefs to control when "#pragma implementation" should be used 2005-05-26 12:09:14 +02:00
sql_olap.cc Implementation of WL#2486 - 2005-08-12 17:57:19 +03:00
sql_parse.cc manual merge 2006-02-14 17:05:36 +01:00
sql_partition.cc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-15 12:52:30 +01:00
sql_plugin.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-13 23:27:51 +01:00
sql_plugin.h BUG#17117: header fille "plugin.h" does not have a namespace prefix 2006-02-14 13:51:25 +04:00
sql_prepare.cc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2006-02-10 18:04:46 +01:00
sql_rename.cc renamedb.test, renamedb.result: 2006-02-13 11:49:28 +04:00
sql_repl.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +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 mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 2006-02-14 20:48:34 +02:00
sql_select.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 23:53:45 +03:00
sql_show.cc manual merge 2006-02-14 17:05:36 +01: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 Inefficient usage of String::append() fixed. 2005-11-20 20:47:07 +02:00
sql_string.h Netware specific changes. 2005-12-14 01:21:56 +02:00
sql_table.cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-13 11:53:56 +04:00
sql_tablespace.cc bug: replication of table spaces to work 2006-01-11 19:49:38 +01:00
sql_test.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sql_trigger.cc Polishing: after implementing TRIGGER privilege, mysqld option 2006-02-13 15:00:01 +03:00
sql_trigger.h Fix for the following bugs: 2006-01-24 20:15:12 +03:00
sql_udf.cc WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
sql_udf.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_union.cc WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
sql_update.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 23:53:45 +03:00
sql_view.cc Bug #17206 Update through VIEW is not working 2006-02-08 18:08:18 +01:00
sql_view.h Finalize storage engine plugins 2005-12-21 10:18:40 -08:00
sql_yacc.yy manual merge 2006-02-14 17:05:36 +01: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#2935 - SHOW STATUS support in plugins 2006-01-07 14:41:57 +01:00
table.cc post-merge fixes of bug 16548 2006-02-14 20:10:51 +01:00
table.h manual merge 2006-02-14 17:05:36 +01:00
thr_malloc.cc
time.cc - fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON) 2006-01-18 20:41:22 +01:00
tzfile.h
tztime.cc WL #1034 (Internal CRON) 2006-01-10 21:02:19 +01:00
tztime.h WL#1034 updated 2005-12-05 11:45:04 +01:00
udf_example.cc
uniques.cc many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
unireg.cc two buffer overflows fixed 2006-01-28 19:21:40 +01:00
unireg.h Merge mysql.com:/home/mydev/mysql-5.0-bug10932 2005-12-06 08:31:38 +01:00
watchdog_mysqld