mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 97dae00306 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysys/my_bitmap.c:
  Manual merge
sql/field.cc:
  e
  Manual merge
sql/item.cc:
  Manual merge (new Field_bit_as_char constructor signature)
sql/item_func.cc:
  Manual merge: use local
sql/sql_insert.cc:
  Manual merge: add VOID() around bitmap_init
2006-02-02 16:57:34 +03:00
..
share Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge 2006-02-02 12:03:35 +03: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-commit merge 2006-01-30 14:28:48 +01:00
event.h add the sql_mode to the enum with the fields 2006-01-31 17:22:38 +01:00
event_executor.cc Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes 2006-01-30 17:57:20 +01:00
event_priv.h post-commit merge 2006-01-30 14:28:48 +01:00
event_timed.cc Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes 2006-01-30 17:57:20 +01:00
field.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +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
gstream.cc
gstream.h
ha_archive.cc Windows compile fixes in preparation for 5.1.6 beta. 2006-01-30 13:09:08 +01:00
ha_archive.h Fixed typo. 2006-01-11 22:59:08 -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 WL#1359 NDB: Add table handler and table information available from SQL commands 2006-01-28 16:16:23 +13:00
ha_federated.h Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_heap.cc WL#1359 NDB: Add table handler and table information available from SQL commands 2006-01-28 16:16:23 +13:00
ha_heap.h Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_innodb.cc WL#1359 NDB: Add table handler and table information available from SQL commands 2006-01-28 16:16:23 +13:00
ha_innodb.h WL#2935 - SHOW STATUS support in plugins 2006-01-07 14:41:57 +01:00
ha_myisam.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03: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 build fix for solaris 10 sparc -max 2006-02-02 16:14:31 +11:00
ha_ndbcluster.h Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-01 13:04:47 +01:00
ha_ndbcluster_binlog.cc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-01 14:58:15 +01:00
ha_ndbcluster_binlog.h wl2325, distribution of schema operations between mysql servers 2006-02-01 01:12:11 +01:00
ha_ndbcluster_tables.h wl2325 wl2324 2006-01-12 19:51:02 +01:00
ha_partition.cc Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new 2006-02-01 18:23:34 +11:00
ha_partition.h WL# 2986 2006-01-28 16:22:32 -08:00
handler.cc Fix the tree: plugin-related changes, necessary for 2006-01-20 00:40:56 +03:00
handler.h Merge mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359 2006-02-02 00:52:32 +11: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
hash_filo.h
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 Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
item.h Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-01-20 19:38:11 +03:00
item_buff.cc sql_select.cc: 2005-07-25 12:57:23 -07:00
item_cmpfunc.cc Merge mysql.com:/opt/local/work/mysql-5.0-for-merge 2006-01-26 16:36:33 +03: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 merged 2006-01-03 18:12:03 +01:00
item_func.h Patch for WL#2894: Make stored routine variables work 2005-12-07 17:01:17 +03: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
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 spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-01-24 15:34:02 +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 fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE) 2006-01-24 16:04:35 +01: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 mysql.com:/home/stewart/Documents/MySQL/5.1/new 2006-02-01 18:23:34 +11:00
log.h Do not create log table handler if run in bootstrap mode. 2006-01-30 02:24:47 +03:00
log_event.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03: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 WL#1359 NDB: Add table handler and table information available from SQL commands 2006-01-28 16:16:23 +13:00
mysqld.cc post-commit merge 2006-01-30 14:28:48 +01: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/tmp_merge 2006-02-02 16:57:34 +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
procedure.h
protocol.cc Big patch to make embedded-server working in 5.x 2006-01-04 14:20:28 +04: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 mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
set_var.h Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup(). 2006-01-25 19:54:42 -08: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 two buffer overflows fixed 2006-01-28 19:21:40 +01:00
sp.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-12-07 12:47:25 +03: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-for_merge 2006-02-02 12:03:35 +03:00
sp_head.h Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge 2006-02-02 12:03:35 +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. (BUG#15231) 2006-01-17 12:48:48 +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 fix --ansi --pedantic compilation failure 2005-11-04 16:17:43 +03:00
sql_acl.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sql_acl.h Addition to the fix for BUG#9412 "Triggers: should have trigger privilege". 2006-02-01 21:27:12 +03:00
sql_analyse.cc Inefficient usage of String::append() fixed. 2005-11-20 20:47:07 +02:00
sql_analyse.h
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 WL1019: complete patch. Reapplied patch to the clean 2006-01-19 05:56:06 +03: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 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-01-24 15:34:02 +03:00
sql_class.h Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-23 11:59:31 +04:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
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 mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sql_delete.cc Portability compilation fixes. 2006-01-20 13:23:24 +01: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 BUG #16596 2006-01-18 16:18:42 -05:00
sql_lex.h post-commit merge 2006-01-30 14:28:48 +01: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 BUG#5390 - problems with merge tables 2005-12-22 13:48:00 +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
sql_olap.cc Implementation of WL#2486 - 2005-08-12 17:57:19 +03:00
sql_parse.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sql_partition.cc Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes 2006-01-30 17:57:20 +01:00
sql_plugin.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-01-07 14:50:03 +01:00
sql_plugin.h WL#2935 - SHOW STATUS support in plugins 2006-01-07 14:41:57 +01:00
sql_prepare.cc Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-19 18:05:57 +04:00
sql_rename.cc WL#1324 table name to file name encoding 2005-12-31 09:01:26 +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:/opt/local/work/mysql-5.0-for-merge 2006-01-26 16:36:33 +03:00
sql_select.h Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
sql_show.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03: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 Post review fixes 2006-01-31 15:53:35 +01: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 Fix for BUG#9412: Triggers: should have trigger privilege. 2006-02-01 13:28:45 +03:00
sql_trigger.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-12-07 12:47:25 +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 spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-01-04 11:25:48 +03:00
sql_view.cc WL#1324 table name to file name encoding 2005-12-31 09:01:26 +04:00
sql_view.h Finalize storage engine plugins 2005-12-21 10:18:40 -08:00
sql_yacc.yy Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge 2006-02-02 12:03:35 +03: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 Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
table.h some fixes from review of WL1359. 2006-02-02 00:47:08 +11: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