database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00
Code
mariadb/sql
History
unknown fb5677b8a0 Merge mysql.com:/opt/local/work/tmp_merge2 
into  mysql.com:/opt/local/work/mysql-5.1-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp-prelocking.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/t/sp-prelocking.test:
  Manual merge.
2006-03-30 19:12:10 +04:00
..
share
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-03-14 00:51:44 -08:00
.cvsignore
…
add_errmsg
…
authors.h
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
client_settings.h
…
cmakelists.txt
some simple CMAKE updates
2006-03-28 10:05:25 -06:00
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_executor.cc
save the modified value and compare it every time. the memory address
2006-03-01 04:22:05 +01:00
event_priv.h
class event_timed -> Event_timed
2006-02-28 18:33:38 +01:00
event_timed.cc
manual merge
2006-03-17 09:40:48 +01:00
event.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
event.h
fix for bug 16408 (Events: crash for an event in a procedure)
2006-03-16 13:14:40 +01:00
field_conv.cc
Re commit of previous fix as the bk tree was broken.
2006-03-14 17:46:25 +02:00
field.cc
Merge mysql.com:/usr/home/bar/mysql-5.0
2006-03-28 18:24:04 +05:00
field.h
Merge mysql.com:/opt/local/work/tmp_merge2
2006-03-30 19:12:10 +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
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
ha_archive.h
This patch adds a new field to the meta file for tracking flushes (this is being kept to later do stats and determine how often the compression buffer is being foiled). This should keep things all nice an compatible between versions.
2006-02-15 00:59:24 -08:00
ha_berkeley.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03: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
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
ha_blackhole.h
BUG#15406: Adding support for transactions to blackhole.
2005-12-02 01:11:49 +01:00
ha_federated.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
ha_federated.h
merged
2006-03-06 23:20:19 +01:00
ha_heap.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-03-29 17:28:40 +03:00
ha_heap.h
Merge mysql.com:/home/kostja/mysql/tmp_merge
2006-02-08 23:53:45 +03:00
ha_innodb.cc
Applied innodb-5.0-ss368 snapshot
2006-03-29 23:04:32 +04:00
ha_innodb.h
Applied innodb-5.1-ss269 snapshot.
2006-03-10 19:22:21 +03:00
ha_myisam.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
ha_myisam.h
Fix the tree: plugin-related changes, necessary for
2006-01-20 00:40:56 +03:00
ha_myisammrg.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
ha_myisammrg.h
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
ha_ndbcluster_binlog.cc
- corrected bug causing hang in getTable when using blob tables
2006-03-24 10:12:34 +01:00
ha_ndbcluster_binlog.h
Bug #18472 race condition between multiple mysqld's when setting up cluster/schema
2006-03-23 22:49:02 +01: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_ndbcluster.cc
Merge mysql.com:/opt/local/work/tmp_merge
2006-03-30 18:43:42 +04:00
ha_ndbcluster.h
Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'
2006-03-24 10:42:55 +01:00
ha_partition.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
ha_partition.h
Bug #14673: Wrong InnoDB default row format
2006-03-08 11:06:01 -08:00
handler.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-03-29 17:28:40 +03:00
handler.h
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
handlerton-win.cc
restored handlerton-win.cc that I mistakenly deleted.
2006-03-28 09:05:23 -06: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
Merge mysql.com:/usr/home/ram/work/mysql-4.1
2006-03-03 15:32:00 +04:00
init.cc
WL#1324 table name to file name encoding
2005-12-31 09:01:26 +04:00
item_buff.cc
sql_select.cc:
2005-07-25 12:57:23 -07:00
item_cmpfunc.cc
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-03-24 12:46:33 -08:00
item_cmpfunc.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
item_create.cc
Fixes to the replication mixed mode (patch approved by Monty):
2006-03-13 15:34:30 +01:00
item_create.h
Adding XPath support: ExtractValue and UpdateXML functions.
2005-12-21 17:13:52 +04:00
item_func.cc
Remove compiler warnings
2006-03-29 17:04:00 +03:00
item_func.h
Fixed bug#13575: SP funcs in select with distinct/group and order by can
2006-03-10 13:53:00 +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
…
item_strfunc.cc
Remove compiler warnings
2006-03-29 17:04:00 +03:00
item_strfunc.h
Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
2006-03-06 12:52:38 +04: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
Fix bug #15706 find_field_in_tables() returns field from outer select
2006-02-15 19:45:06 +03:00
item_sum.cc
Merge mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-08 17:16:43 +04:00
item_sum.h
Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was
2006-02-28 19:30:30 +03:00
item_timefunc.cc
Remove unused variable
2006-03-28 19:34:44 +02: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
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
item_xmlfunc.h
Adding XPath support: ExtractValue and UpdateXML functions.
2005-12-21 17:13:52 +04:00
item.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
item.h
Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
2006-03-03 12:03:27 +01:00
key.cc
Remove unused variable
2006-03-28 19:34:44 +02:00
lex_symbol.h
…
lex.h
BUG#17754
2006-03-20 14:36:21 -05:00
lock.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
log_event.cc
Merge mysql.com:/home/bkroot/mysql-5.0
2006-03-21 20:17:28 +01:00
log_event.h
WL#3023 (Use locks in a statement-like manner):
2006-03-08 21:49:49 +01:00
log.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-03-29 17:28:40 +03:00
log.h
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
Makefile.am
Manual merge.
2006-03-28 10:07:03 +02: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
…
mysql_priv.h
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
mysqld_suffix.h
…
mysqld.cc
Declare innobase "srv_*" variables as extern "C"
2006-03-28 19:27:38 +02:00
net_serv.cc
Make the define start at "start of line"
2006-03-02 10:55:55 +01:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-03-29 17:28:40 +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
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
Fix for bug#15447 Partitions: NULL is treated as zero
2006-03-07 15:25:08 +04:00
partition_info.cc
bug 17290 and bug 14350
2006-03-18 18:48:21 +04:00
partition_info.h
bug 17290 and bug 14350
2006-03-18 18:48:21 +04:00
password.c
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
procedure.cc
…
procedure.h
…
protocol.cc
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +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
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
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-03-11 07:26:58 +01:00
rpl_injector.h
wl#3023 clean up
2006-03-11 15:52:38 +01:00
rpl_rli.h
WL#3023 (Use locks in a statement-like manner):
2006-02-16 08:30:53 +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
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
set_var.h
WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement),
2006-02-25 22:21:03 +01:00
slave.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
slave.h
Merge mysql.com:/home/kostja/mysql/tmp_merge
2006-02-02 16:57:34 +03:00
sp_cache.cc
Remove unused variable
2006-03-28 19:34:44 +02: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
Remove compiler warnings
2006-03-29 17:04:00 +03:00
sp_head.h
Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree
2006-03-09 20:41:21 +03:00
sp_pcontext.cc
Fixed BUG#16887: Cursor causes server segfault
2006-02-15 12:11:29 +01:00
sp_pcontext.h
Fixed BUG#16887: Cursor causes server segfault
2006-02-15 12:11:29 +01:00
sp_rcontext.cc
Post-review fix for BUG#15011.
2006-02-01 16:00:11 +01:00
sp_rcontext.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
sp.cc
Merge mysql.com:/opt/local/work/tmp_merge2
2006-03-30 19:12:10 +04:00
sp.h
Fixed BUG#16303: erroneus stored procedures and functions should be droppable
2006-01-26 13:29:46 +01: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
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
sql_acl.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
sql_acl.h
manual merge
2006-02-14 17:05:36 +01:00
sql_analyse.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03: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
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-03-29 17:28:40 +03: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
merge
2005-07-20 00:40:49 +02:00
sql_cache.cc
dbug changes:
2006-02-14 22:36:11 +01:00
sql_cache.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
sql_class.cc
Refactored some code to remove ifdef and removed dead code related to un-useable sync code.
2006-03-23 05:51:31 -08:00
sql_class.h
Improved fix for HPUX compile failure.
2006-03-24 12:24:31 +01:00
sql_client.cc
…
sql_crypt.cc
…
sql_crypt.h
…
sql_cursor.cc
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02: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 shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-01 15:49:50 +01:00
sql_delete.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
sql_derived.cc
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
sql_do.cc
…
sql_error.cc
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 18:14:02 +01: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:/opt/local/work/tmp_merge2
2006-03-30 19:12:10 +04:00
sql_lex.cc
Fixes to the replication mixed mode (patch approved by Monty):
2006-03-13 15:34:30 +01:00
sql_lex.h
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-03-20 14:41:50 -05: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 mysql.com:/opt/local/work/tmp_merge2
2006-03-30 19:12:10 +04: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
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
sql_partition.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-03-29 17:28:40 +03:00
sql_partition.h
Bug#18053 Partitions: crash if null
2006-03-28 17:25:19 +05:00
sql_plugin.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
sql_plugin.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-02-14 22:57:12 +01:00
sql_prepare.cc
Merge zim.(none):/home/brian/mysql/mysql-5.0
2006-03-09 17:06:04 -08: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
Refactored some code to remove ifdef and removed dead code related to un-useable sync code.
2006-03-23 05:51:31 -08: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/tmp_merge2
2006-03-30 19:12:10 +04:00
sql_select.h
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:07 +03:00
sql_show.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +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
Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
2006-03-23 12:41:28 +04:00
sql_string.h
Netware specific changes.
2005-12-14 01:21:56 +02:00
sql_table.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03: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
Merge zim.(none):/home/ian/workspace/mysql-5.0
2006-03-27 19:48:44 -08:00
sql_trigger.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
2006-02-26 16:38:48 +03:00
sql_udf.cc
Bug#11835 CREATE FUNCTION crashes server
2006-03-21 10:54:26 +01:00
sql_udf.h
…
sql_union.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_update.cc
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
sql_view.cc
Merge mysql.com:/opt/local/work/tmp_merge2
2006-03-30 19:12:10 +04:00
sql_view.h
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
sql_yacc.yy
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +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
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
table.h
Bug#18280 (RBR: Extreneous maps when writing to general_log and slow_log):
2006-03-17 18:11:07 +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
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
tztime.h
Merge mysql.com:/home/my/mysql-5.0
2006-02-25 21:54:34 +02:00
udf_example.cc
Fix 'metaphon' function to correctly calculate the length of the returned string
2006-03-24 11:12:32 +01:00
uniques.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
unireg.cc
bug 17290 and bug 14350
2006-03-18 18:48:21 +04:00
unireg.h
Merge mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-06 08:31:38 +01:00
watchdog_mysqld
…