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
Alfranio Correia 5dcb0e447f merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 
Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test
Text conflict in mysql-test/r/mysqlbinlog2.result
Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result
Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
Text conflict in mysql-test/suite/rpl/r/rpl_udf.result
Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test
Text conflict in sql/field.h
Text conflict in sql/log.cc
Text conflict in sql/log_event.cc
Text conflict in sql/log_event_old.cc
Text conflict in sql/mysql_priv.h
Text conflict in sql/share/errmsg.txt
Text conflict in sql/sp.cc
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_base.cc
Text conflict in sql/sql_class.h
Text conflict in sql/sql_db.cc
Text conflict in sql/sql_delete.cc
Text conflict in sql/sql_insert.cc
Text conflict in sql/sql_lex.cc
Text conflict in sql/sql_lex.h
Text conflict in sql/sql_load.cc
Text conflict in sql/sql_table.cc
Text conflict in sql/sql_update.cc
Text conflict in sql/sql_view.cc
Conflict adding files to storage/innobase.  Created directory.
Conflict because storage/innobase is not versioned, but has versioned children.  Versioned directory.
Conflict adding file storage/innobase.  Moved existing file to storage/innobase.moved.
Conflict adding files to storage/innobase/handler.  Created directory.
Conflict because storage/innobase/handler is not versioned, but has versioned children.  Versioned directory.
Contents conflict in storage/innobase/handler/ha_innodb.cc
2010-01-07 15:39:11 +00:00
..
examples
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-17 15:54:01 +02:00
share
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
add_errmsg
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
authors.h
manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2009-10-22 23:30:28 +01:00
client_settings.h
Backport of WL#798 (MySQL IPv6 support) from 6.0.
2009-11-25 13:53:23 +03:00
CMakeLists.txt
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
2009-11-06 18:35:04 +02: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#2360 Performance schema
2009-12-09 20:19:51 -07:00
debug_sync.h
WL#4259 - Debug Sync Facility
2009-09-29 17:38:40 +02:00
derror.cc
Backport of:
2009-11-24 16:54:59 +03:00
des_key_file.cc
Backport of:
2009-11-24 16:54:59 +03:00
discover.cc
Backport of:
2009-11-24 16:54:59 +03:00
event_data_objects.cc
Manual merge of mysql-next-mr-runtime upstream.
2009-11-19 21:48:08 -02:00
event_data_objects.h
Bug#35997 Event scheduler seems to let the server crash, if it is embedded.
2008-05-09 09:43:02 +02:00
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
Bug#29125 Windows Server X64: so many compiler warnings
2009-02-13 11:41:47 -05:00
event_parse_data.h
Added "Sun Microsystems, Inc." to copyright headers on files modified
2008-11-10 21:21:49 +01:00
event_queue.cc
Bug#35997 Event scheduler seems to let the server crash, if it is embedded.
2008-05-09 09:43:02 +02:00
event_queue.h
…
event_scheduler.cc
Merge
2009-12-14 17:08:30 +01:00
event_scheduler.h
…
events.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
events.h
…
field_conv.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-17 15:54:01 +02:00
field.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00: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
Backport of:
2009-11-24 16:54:59 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
Bug#29125 Windows Server X64: so many compiler warnings
2009-02-13 11:41:47 -05:00
gstream.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-09 18:11:21 +02:00
gstream.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
ha_ndbcluster_binlog.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
ha_ndbcluster_binlog.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
ha_ndbcluster_cond.cc
fixed warnings and compile errors from the fix for bug 26243
2008-03-29 09:52:16 +02:00
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 cleanup
2009-12-11 12:45:44 -07:00
ha_ndbcluster.h
manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2009-10-22 23:30:28 +01:00
ha_partition.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
ha_partition.h
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
2009-11-06 18:35:04 +02:00
handler.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
handler.h
Merge mysql-next-mr to mysql-next-mr-svoj.
2009-12-09 15:03:34 +04:00
hash_filo.cc
…
hash_filo.h
Backport of:
2009-10-14 20:37:38 +04:00
hostname.cc
Backport of WL#798 (MySQL IPv6 support) from 6.0.
2009-11-25 13:53:23 +03:00
init.cc
Backport of:
2009-11-24 16:54:59 +03:00
item_buff.cc
…
item_cmpfunc.cc
Auto-merge from mysql-trunk-merge.
2009-12-16 21:37:10 +03:00
item_cmpfunc.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_create.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
item_create.h
…
item_func.cc
Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc
2009-12-16 15:48:55 -07:00
item_func.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_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
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
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.
2009-12-16 21:02:21 +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
Post-merge fix.
2009-12-14 17:17:41 +03: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
Auto-merge from mysql-next-mr.
2009-12-19 11:35:19 +03: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
Post-merge fix.
2009-12-14 17:17:41 +03:00
item.h
Auto-merge from mysql-next-mr.
2009-12-19 11:35:19 +03:00
key.cc
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05: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
Merge cleanup
2009-12-11 12:45:44 -07:00
log_event_old.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
log_event_old.h
…
log_event.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
log_event.h
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
log.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
log.h
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
Makefile.am
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
2009-11-06 18:35:04 +02:00
message.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
message.mc
Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.
2008-10-23 15:28:53 +02:00
message.rc
Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.
2008-10-23 15:28:53 +02:00
mf_iocache.cc
…
MSG00001.bin
Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.
2008-10-23 15:28:53 +02:00
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
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00: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 mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00: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
merge
2008-11-22 01:10:38 +01:00
nt_servc.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
opt_range.cc
Manual merge from mysql-trunk.
2009-12-11 12:39:38 +03: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
Bug#44834 strxnmov is expected to behave as you'd expect
2009-06-19 13:24:43 +05:00
parse_file.h
Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist(addon)
2009-04-13 18:09:10 +05:00
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
Manual merge.
2009-06-01 16:00:38 +04:00
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
Backport of:
2009-11-24 16:54:59 +03:00
records.h
Manual merge from mysql-trunk-merge.
2009-11-06 19:13:33 +03:00
repl_failsafe.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
repl_failsafe.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
replication.h
WL#2360 Performance schema
2009-12-09 20:19:51 -07:00
rpl_constants.h
BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event
2008-12-29 17:04:10 +01:00
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
BUG#48048: Deprecated constructs need removal in Betony
2009-11-04 12:28:20 +00:00
rpl_mi.h
BUG#48048: Deprecated constructs need removal in Betony
2009-11-04 12:28:20 +00:00
rpl_record_old.cc
…
rpl_record_old.h
…
rpl_record.cc
PB2 was showing some valgrind warnings after WL#5151 was pushed.
2009-12-22 11:51:46 +00: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
BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind
2009-06-16 16:04:30 +01:00
rpl_reporting.h
BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind
2009-06-16 16:04:30 +01:00
rpl_rli.cc
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
rpl_rli.h
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +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
PB2 was showing some valgrind warnings after WL#5151 was pushed.
2009-12-22 11:51:46 +00:00
rpl_utility.h
BUG#49618: Field length stored incorrectly in binary log
2009-12-15 16:11:44 +01:00
scheduler.cc
…
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 15:39:11 +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-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
slave.h
Backport of:
2009-11-23 19:57:31 +03: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
A fix for
2008-07-03 23:41:22 +04:00
sp_head.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sp_head.h
merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1
2009-12-17 21:43:35 +00:00
sp_pcontext.cc
Backport of:
2009-11-24 16:54:59 +03:00
sp_pcontext.h
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06: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
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sp.h
Bug#45613 handle failures from my_hash_insert
2009-11-20 16:18:01 +01:00
spatial.cc
Merge from 5.0 for 43414
2009-08-28 18:21:54 +02:00
spatial.h
Merge from 5.0-bugteam
2009-06-17 16:56:44 +02:00
sql_acl.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_acl.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
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_base.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00: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
…
sql_cache.cc
Manual merge from mysql-trunk-merge.
2009-12-12 23:38:59 +03:00
sql_cache.h
Manual merge from mysql-trunk.
2009-12-11 12:39:38 +03:00
sql_class.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_class.h
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_client.cc
…
sql_connect.cc
Backport of WL#798 (MySQL IPv6 support) from 6.0.
2009-11-25 13:53:23 +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#5138, Fixed according to code review comments from Davi
2009-11-24 14:28:38 +01:00
sql_cursor.h
…
sql_db.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_delete.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_derived.cc
WL#2110 (SIGNAL)
2009-09-10 03:18:29 -06:00
sql_do.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
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 mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00: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
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00: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
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_locale.cc
Manual-merge from mysql-trunk-merge.
2009-11-06 12:52:45 +03:00
sql_manager.cc
Bug#38522: 5 seconds delay when closing application using embedded server
2008-12-04 19:41:53 +01:00
sql_map.cc
Backport of:
2009-11-24 16:54:59 +03: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
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_partition.cc
Manual merge from mysql-next-mr.
2009-12-17 23:02:52 +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 mysql-next-mr (revno 2936) --> mysql-next-mr-marc
2009-12-11 01:58:13 -07:00
sql_plugin.h
WL#4903 Plugin Service API part I
2009-11-02 21:05:42 +01:00
sql_prepare.cc
Backport of:
2009-11-23 19:57:31 +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
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.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
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_repl.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_select.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_select.h
Bug#33546: Slowdown on re-evaluation of constant expressions.
2009-12-02 00:25:51 +03:00
sql_servers.cc
Manual merge/pull from mysql-next-mr.
2009-11-25 18:03:05 +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.
2009-12-19 11:35:19 +03:00
sql_show.h
Added "Sun Microsystems, Inc." to copyright headers on files modified
2008-11-10 21:21:49 +01:00
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:
2009-11-24 16:54:59 +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
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00: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
Merge cleanup
2009-12-11 12:45:44 -07:00
sql_trigger.cc
Merge cleanup
2009-12-11 12:45:44 -07:00
sql_trigger.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_udf.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_udf.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_union.cc
5.0-bugteam->5.1-bugteam merge
2009-05-15 12:11:07 +05:00
sql_update.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_view.cc
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
sql_view.h
WL#5016: Fix header file include guards
2009-09-23 23:32:31 +02:00
sql_yacc.yy
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-07 15:39:11 +00:00
strfunc.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-09-23 15:21:29 +02:00
structs.h
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw
2009-11-30 14:34:39 +02:00
table.cc
Manual merge from mysql-trunk-merge.
2009-12-12 23:38:59 +03:00
table.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
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
Manual merge/pull from mysql-next-mr.
2009-11-25 18:03:05 +03: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
Backport of:
2009-11-24 16:54:59 +03:00
unireg.h
Backport of:
2009-11-23 19:57:31 +03:00