database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-02 02:53:04 +03:00
Code Activity
Files
274a193ded80754c8ff2acbf279f72c1b4a93ab6
mariadb/sql
History
Alexander Nozdrin 274a193ded Auto-merge from mysql-trunk-merge. 
main.partition_innodb started to pass.
2010-01-28 00:42:22 +03:00
..
examples
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-17 15:54:01 +02:00
share
Removes duplicate entry for ER_SLAVE_IGNORE_SERVER_IDS
2010-01-20 17:01:49 +00:00
add_errmsg
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
authors.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
client_settings.h
Backport of WL#798 (MySQL IPv6 support) from 6.0.
2009-11-25 13:53:23 +03:00
CMakeLists.txt
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 17:30:55 +04:00
contributors.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
custom_conf.h
…
debug_sync.cc
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
debug_sync.h
WL#4259 - Debug Sync Facility
2009-09-29 17:38:40 +02:00
derror.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
des_key_file.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
discover.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
event_data_objects.cc
Bug#49501 Inefficient information_schema check (system collation)
2010-01-19 13:03:40 +04:00
event_data_objects.h
…
event_db_repository.cc
merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1
2009-12-17 21:43:35 +00:00
event_db_repository.h
…
event_parse_data.cc
…
event_parse_data.h
…
event_queue.cc
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 17:30:55 +04:00
event_queue.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
event_scheduler.cc
WL#2360 Performance schema
2010-01-11 18:47:27 -07:00
event_scheduler.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
events.cc
Manual merge from mysql-trunk-merge.
2010-01-28 00:10:37 +03:00
events.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
field_conv.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-17 15:54:01 +02:00
field.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
field.h
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
filesort.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
frm_crypt.cc
…
gen_lex_hash.cc
…
gstream.cc
…
gstream.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
ha_ndbcluster_binlog.cc
merge mysql-next-mr --> mysql-5.1-rpl-merge
2010-01-14 16:02:55 +00:00
ha_ndbcluster_binlog.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
ha_ndbcluster_cond.cc
…
ha_ndbcluster_cond.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
ha_ndbcluster_tables.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
ha_ndbcluster.cc
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 17:30:55 +04:00
ha_ndbcluster.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
ha_partition.cc
Auto-merge from mysql-trunk-merge.
2010-01-28 00:42:22 +03:00
ha_partition.h
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
handler.cc
merge mysql-next-mr --> mysql-5.1-rpl-merge
2010-01-13 12:22:34 +00:00
handler.h
backported:
2010-01-15 15:42:15 +04:00
hash_filo.cc
…
hash_filo.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
hostname.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
init.cc
Backport of:
2009-11-24 16:54:59 +03:00
item_buff.cc
…
item_cmpfunc.cc
merge 5.1-main to 5.1-bugteam
2010-01-13 12:28:42 +02:00
item_cmpfunc.h
merge 5.1-main to 5.1-bugteam
2010-01-13 12:28:42 +02:00
item_create.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
item_create.h
…
item_func.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
item_func.h
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
2009-12-25 13:56:50 +03:00
item_geofunc.cc
Manual merge of the fix for bug#43668.
2009-11-24 18:26:13 +03:00
item_geofunc.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
item_row.cc
…
item_row.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
item_strfunc.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
item_strfunc.h
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
2009-12-11 19:40:58 +03:00
item_subselect.cc
Manual merge from mysql-trunk.
2009-12-11 12:39:38 +03:00
item_subselect.h
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7
2009-12-17 00:09:52 +00:00
item_sum.cc
Bug#48920: COUNT DISTINCT returns 1 for NULL values when in a
2010-01-04 10:39:42 +01:00
item_sum.h
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7
2009-12-17 00:09:52 +00:00
item_timefunc.cc
Manual merge from mysql-trunk-merge.
2009-12-16 21:02:21 +03:00
item_timefunc.h
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
item_xmlfunc.cc
Bug#34384: Slow down on constant conversion.
2009-11-06 22:34:25 +03:00
item_xmlfunc.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
item.cc
Auto-merge from mysql-trunk-merge.
2010-01-27 22:15:32 +03:00
item.h
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
key.cc
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
keycaches.cc
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
keycaches.h
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
lex_symbol.h
…
lex.h
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
lock.cc
WL#2360 Performance schema
2010-01-11 18:47:27 -07:00
log_event_old.cc
Manual merge from mysql-trunk-merge.
2010-01-27 22:55:51 +03:00
log_event_old.h
…
log_event.cc
Manual merge from mysql-trunk-merge.
2010-01-27 22:55:51 +03:00
log_event.h
merge mysql-next-mr --> mysql-5.1-rpl-merge
2010-01-13 12:22:34 +00:00
log.cc
Auto-merge from mysql-next-mr.
2010-01-25 19:48:45 +03:00
log.h
merge mysql-next-mr --> mysql-5.1-rpl-merge
2010-01-13 12:22:34 +00:00
Makefile.am
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 17:30:55 +04:00
message.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
message.mc
…
message.rc
…
mf_iocache.cc
…
MSG00001.bin
…
my_decimal.cc
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
my_decimal.h
Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields when using IF
2009-11-02 09:21:39 -02:00
my_lock.c
…
mysql_priv.h
Manual merge from mysql-trunk-merge.
2010-01-28 00:10:37 +03:00
mysql_priv.h.pp
Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clash
2009-10-06 13:04:51 +02:00
mysqld_suffix.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
mysqld.cc
Merge backport of WL#3771 with mysql-next-mr.
2010-01-22 12:37:51 +04:00
net_serv.cc
WL#4949, Remove use of LOCK_alarm by instead using SO_SNDTIME0/SO_RCVTIME0
2009-11-12 12:17:31 +01:00
nt_servc.cc
…
nt_servc.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
opt_range.cc
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
opt_range.h
Backport of:
2009-11-24 16:54:59 +03:00
opt_sum.cc
Backport of Bug#15192 to mysql-next-mr
2009-11-10 18:31:28 -02:00
parse_file.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
parse_file.h
…
partition_element.h
Merge
2009-10-28 18:32:48 +01:00
partition_info.cc
BUG#49591, Fixed version string in SHOW CREATE TABLE to accomodate for column list partitioning and new function to_seconds
2009-12-17 18:39:10 +01:00
partition_info.h
BUG#49591, Fixed version string in SHOW CREATE TABLE to accomodate for column list partitioning and new function to_seconds
2009-12-17 18:39:10 +01:00
password.c
…
procedure.cc
…
procedure.h
Merge from mysql-next-mr.
2009-10-28 10:55:44 +03:00
protocol.cc
merge (and including the fix for bug#48939 since that was not included in mysql-trunk-bugfixing).
2009-12-15 23:47:04 +01:00
protocol.h
Merge from mysql-next-mr.
2009-10-28 10:55:44 +03:00
records.cc
WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"
2010-01-06 11:54:45 +01:00
records.h
Manual merge from mysql-trunk-merge.
2009-11-06 19:13:33 +03:00
repl_failsafe.cc
Bug#49501 Inefficient information_schema check (system collation)
2010-01-19 13:03:40 +04:00
repl_failsafe.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
replication.h
WL#2360 Performance schema
2009-12-09 20:19:51 -07:00
rpl_constants.h
…
rpl_filter.cc
Backport of:
2009-10-14 20:37:38 +04:00
rpl_filter.h
…
rpl_handler.cc
Auto merge from 5.1-rep-semisync
2009-12-05 10:28:53 +08:00
rpl_handler.h
Backporting WL#4398 WL#1720
2009-09-26 12:49:49 +08:00
rpl_injector.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
rpl_injector.h
Backport of:
2009-10-14 15:14:58 +04:00
rpl_mi.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
rpl_mi.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
rpl_record_old.cc
…
rpl_record_old.h
…
rpl_record.cc
Merging with mysql-5.1-rep+2-delivery1
2010-01-13 14:00:48 +01:00
rpl_record.h
BUG#48091 valgrind errors when slave has double not null and master has double null
2009-10-22 01:15:45 +01:00
rpl_reporting.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
rpl_reporting.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
rpl_rli.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
rpl_rli.h
merge mysql-next-mr --> mysql-5.1-rpl-merge
2010-01-13 12:22:34 +00:00
rpl_tblmap.cc
Manual merge from mysql-trunk.
2009-12-11 12:39:38 +03:00
rpl_tblmap.h
Backport of:
2009-10-14 20:37:38 +04:00
rpl_utility.cc
Merging with mysql-5.1-rep+2-delivery1
2010-01-13 13:37:01 +01:00
rpl_utility.h
Bug#48776 row based replication breaks with spatial / geometry types, cause crashes!
2010-01-05 14:25:29 +08:00
scheduler.cc
WL#2360 Performance schema
2010-01-11 18:47:27 -07:00
scheduler.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
set_var.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 17:39:01 +00:00
set_var.h
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
slave.cc
merge mysql-next-mr --> mysql-5.1-rpl-merge
2010-01-14 16:02:55 +00:00
slave.h
WL#2360 Performance schema
2010-01-11 18:47:27 -07:00
sp_cache.cc
Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc
2009-12-16 15:48:55 -07:00
sp_cache.h
…
sp_head.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
sp_head.h
Auto-merge from mysql-next-mr.
2010-01-21 12:14:34 +03:00
sp_pcontext.cc
Backport of:
2009-11-24 16:54:59 +03:00
sp_pcontext.h
Manual merge.
2009-12-18 16:44:24 -02:00
sp_rcontext.cc
Manual merge from mysql-trunk.
2009-12-11 12:39:38 +03:00
sp_rcontext.h
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
sp.cc
Auto-merge from mysql-next-mr.
2010-01-21 12:14:34 +03:00
sp.h
backported:
2010-01-15 15:42:15 +04:00
spatial.cc
Backport of WL #2934: Make/find library for doing float/double
2009-12-22 19:23:13 +03:00
spatial.h
Merge from 5.0-bugteam
2009-06-17 16:56:44 +02:00
sql_acl.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
sql_acl.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
sql_analyse.cc
Merge from 5.0-bugteam
2009-06-17 16:56:44 +02:00
sql_analyse.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_array.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_audit.cc
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 17:30:55 +04:00
sql_audit.h
Backport from 6.0-codebase.
2009-12-16 15:56:36 +04:00
sql_base.cc
Auto-merge from mysql-next-mr.
2010-01-21 12:14:34 +03:00
sql_binlog.cc
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
2009-11-06 18:35:04 +02:00
sql_bitmap.h
…
sql_builtin.cc.in
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
sql_cache.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
sql_cache.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
sql_class.cc
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 20:42:25 +04:00
sql_class.h
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 20:42:25 +04:00
sql_client.cc
…
sql_connect.cc
Auto-merge from mysql-next-mr.
2010-01-25 19:48:45 +03:00
sql_crypt.cc
Bug#49141: Encode function is significantly slower in 5.1 compared to 5.0
2009-12-04 13:36:58 -02:00
sql_crypt.h
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
2009-12-11 19:40:58 +03:00
sql_cursor.cc
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
sql_cursor.h
…
sql_db.cc
Manual merge from mysql-trunk-merge.
2010-01-28 00:10:37 +03:00
sql_delete.cc
Manual merge from next-mr.
2010-01-12 20:07:09 +08:00
sql_derived.cc
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
sql_do.cc
…
sql_error.cc
Merge from mysql-next-mr.
2009-10-23 15:22:21 +04:00
sql_error.h
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
sql_handler.cc
Merge cleanup
2009-12-11 12:45:44 -07:00
sql_help.cc
Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,
2009-10-22 00:02:06 +04:00
sql_insert.cc
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 20:42:25 +04:00
sql_lex.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_lex.h
Manual merge from next-mr.
2010-01-12 20:07:09 +08:00
sql_list.cc
Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,
2009-10-22 00:02:06 +04:00
sql_list.h
Backport of Bug#15192 to mysql-next-mr
2009-11-10 18:31:28 -02:00
sql_load.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
sql_locale.cc
Manual-merge from mysql-trunk-merge.
2009-11-06 12:52:45 +03:00
sql_manager.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
sql_map.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
sql_map.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_olap.cc
…
sql_parse.cc
Manual merge from mysql-trunk-merge.
2010-01-28 00:24:35 +03:00
sql_partition.cc
Manual merge from mysql-trunk-merge.
2010-01-28 00:24:35 +03:00
sql_partition.h
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
2009-12-16 16:47:07 +03:00
sql_plugin_services.h
WL#4903 Plugin Service API part I
2009-11-02 21:05:42 +01:00
sql_plugin.cc
Merge backport of WL#3771 with mysql-next-mr.
2010-01-19 17:30:55 +04:00
sql_plugin.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
sql_prepare.cc
Auto-merge from mysql-trunk-merge.
2010-01-27 22:35:04 +03:00
sql_prepare.h
Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,
2009-10-22 00:02:06 +04:00
sql_profile.cc
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
sql_profile.h
Bug #44651 "have_community_features" variable should be renamed
2009-10-09 15:59:25 +02:00
sql_rename.cc
Merge cleanup
2009-12-11 12:45:44 -07:00
sql_repl.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
sql_repl.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_select.cc
Auto-merge from mysql-trunk-merge.
2010-01-28 00:32:29 +03:00
sql_select.h
Auto-merge from mysql-trunk-merge.
2010-01-27 22:15:32 +03:00
sql_servers.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
sql_servers.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_show.cc
Auto-merge from mysql-next-mr.
2010-01-21 12:14:34 +03:00
sql_show.h
…
sql_signal.cc
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
sql_signal.h
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
sql_sort.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_state.c
…
sql_string.cc
Backport of WL #2934: Make/find library for doing float/double
2009-12-22 19:23:13 +03:00
sql_string.h
Bug #33544 UDF_INIT member decimals initialized wrong with
2009-11-11 21:19:41 +01:00
sql_table.cc
Manual merge from mysql-trunk-merge.
2010-01-28 00:24:35 +03:00
sql_tablespace.cc
BUG#37148 Most callers of mysql_bin_log.write ignore the return result
2009-11-21 12:28:01 +08:00
sql_test.cc
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
sql_trigger.cc
backported:
2010-01-15 15:42:15 +04:00
sql_trigger.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_udf.cc
merge mysql-next-mr --> mysql-5.1-rpl-merge
2010-01-13 12:22:34 +00:00
sql_udf.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_union.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
sql_update.cc
Manual merge from mysql-trunk-merge.
2010-01-19 19:36:14 +03:00
sql_view.cc
Auto-merge from mysql-next-mr.
2010-01-21 12:14:34 +03:00
sql_view.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_yacc.yy
Manual merge from next-mr.
2010-01-12 20:07:09 +08:00
strfunc.cc
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
structs.h
WL#4738 streamline/simplify @@variable creation process
2009-12-22 10:35:56 +01:00
sys_vars_shared.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
sys_vars.cc
merge mysql-next-mr --> mysql-5.1-rpl-merge
2010-01-13 12:22:34 +00:00
sys_vars.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
table.cc
Manual merge from mysql-trunk-merge.
2010-01-28 00:10:37 +03:00
table.h
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
thr_malloc.cc
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
time.cc
Manual merge from mysql-trunk-merge.
2009-11-06 17:20:27 +03:00
tzfile.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
tztime.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
tztime.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
udf_example.c
Backport of:
2009-11-24 16:54:59 +03:00
udf_example.def
…
uniques.cc
Backport of:
2009-11-24 16:54:59 +03:00
unireg.cc
WL#2360 Performance schema
2010-01-06 22:42:07 -07:00
unireg.h
backported:
2010-01-15 15:42:15 +04:00