..
examples
Bug#473914: mysql_client_test fail with in debug compilaton on windows x64
2010-12-06 12:52:06 +01:00
share
merge 5.2
2011-03-10 09:39:14 +01:00
.cvsignore
add_errmsg
authors.h
Merge with MariaDB 5.1.49
2010-08-05 22:56:11 +03:00
client_settings.h
fixes for windows builds
2010-04-02 11:20:09 +02:00
CMakeLists.txt
merge 5.2
2011-03-10 09:39:14 +01:00
contributors.h
create_options.cc
small enhancement of the create table options feature:
2011-05-10 18:19:11 +02:00
create_options.h
small enhancement of the create table options feature:
2011-05-10 18:19:11 +02:00
custom_conf.h
debug_sync.cc
Fixed compiler warnings.
2010-12-03 23:19:13 +02:00
debug_sync.h
Bug #51648 DBUG_SYNC_POINT is not defined on all platforms and mtr cant pre-check that
2010-03-19 11:06:40 +02:00
derror.cc
Ensure we don't read a MariaDB 5.3 errmsg.sys file or new errmsg.sys file with holes for not used error messages
2011-05-20 14:36:13 +03:00
des_key_file.cc
discover.cc
Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs increasing.
2011-06-12 15:52:07 +02:00
event_data_objects.cc
Merge with MariaDB 5.1.49
2010-08-05 22:56:11 +03:00
event_data_objects.h
Change some my_bool in C++ classes and a few functions to bool to detect wrong usage of bool/my_bool.
2010-09-24 01:00:32 +03:00
event_db_repository.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
event_db_repository.h
Change some my_bool in C++ classes and a few functions to bool to detect wrong usage of bool/my_bool.
2010-09-24 01:00:32 +03:00
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
Change some my_bool in C++ classes and a few functions to bool to detect wrong usage of bool/my_bool.
2010-09-24 01:00:32 +03:00
event_queue.cc
mysqltest: Write command to be executed to the log BEFORE executing the command.
2011-05-09 14:38:49 +03:00
event_queue.h
event_scheduler.cc
Make event stop code even more robust.
2011-05-09 15:14:04 +03:00
event_scheduler.h
events.cc
Change TABLE->alias to String for less memory reallocation
2011-02-28 12:48:50 +02:00
events.h
Change some my_bool in C++ classes and a few functions to bool to detect wrong usage of bool/my_bool.
2010-09-24 01:00:32 +03:00
field.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
field.h
small enhancement of the create table options feature:
2011-05-10 18:19:11 +02:00
field_conv.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
filesort.cc
Fixed bug #607566 .
2010-07-19 22:41:24 -07:00
frm_crypt.cc
gen_lex_hash.cc
Merge
2010-12-29 00:47:05 +01:00
gstream.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-09 18:11:21 +02:00
gstream.h
ha_ndbcluster.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
ha_ndbcluster.h
restore the unintentinally broken ABI
2010-07-23 22:37:21 +02:00
ha_ndbcluster_binlog.cc
pluggable auth with plugin examples
2010-03-29 17:13:53 +02:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
ha_partition.h
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
handler.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
handler.h
small enhancement of the create table options feature:
2011-05-10 18:19:11 +02:00
hash_filo.cc
Fix a bunch of Windows warnings
2010-04-21 02:25:59 +02:00
hash_filo.h
Change some my_bool in C++ classes and a few functions to bool to detect wrong usage of bool/my_bool.
2010-09-24 01:00:32 +03:00
hostname.cc
Merge with MySQL 5.1.57/58
2011-05-02 20:58:45 +03:00
init.cc
item.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
item.h
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
item_buff.cc
Bug #55188 : GROUP BY, GROUP_CONCAT and TEXT - inconsistent results
2010-07-30 16:35:06 +03:00
item_cmpfunc.cc
Fixed lock sorting and lock check issues with thr_lock that caused warnings when running test suite.
2011-06-06 16:39:06 +03:00
item_cmpfunc.h
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
item_create.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_create.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_func.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
item_func.h
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
item_geofunc.cc
Manual merge of the fix for bug#43668.
2009-11-24 18:26:13 +03:00
item_geofunc.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_row.cc
Fixed following problems:
2010-12-14 12:33:03 +03:00
item_row.h
merge 5.1->5.2
2010-06-01 21:52:20 +02:00
item_strfunc.cc
Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs increasing.
2011-06-12 15:52:07 +02:00
item_strfunc.h
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
item_subselect.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
item_subselect.h
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
item_sum.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
item_sum.h
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
item_timefunc.cc
Merge with MySQL 5.1.57/58
2011-05-02 20:58:45 +03:00
item_timefunc.h
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
item_xmlfunc.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
item_xmlfunc.h
The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.
2009-10-16 15:57:48 -07:00
key.cc
few small MySQL bugs/issues that impact the engines, as discussed in the SE summit
2010-06-05 16:53:36 +02:00
lex.h
pluggable auth with plugin examples
2010-03-29 17:13:53 +02:00
lex_symbol.h
lock.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
log.cc
Fix line endings.
2011-05-26 13:42:22 +02:00
log.h
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
log_event.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
log_event.h
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
log_event_old.cc
merge with 5.1
2010-09-11 20:43:48 +02:00
log_event_old.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
log_slow.h
Updated documentation files to reflect MariaDB and not the Maria storage engine or MySQL
2009-09-03 17:05:38 +03:00
Makefile.am
Fix error in "make dist" (sql/CMakeLists.txt is not delivered in source distribution)
2011-04-03 20:56:47 +02:00
message.h
- Added/updated copyright headers
2010-12-28 19:57:23 +01:00
message.mc
message.rc
mf_iocache.cc
Fix a bunch of Windows warnings
2010-04-21 02:25:59 +02:00
MSG00001.bin
my_decimal.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
my_decimal.h
Merge with MySQL 5.1.53
2010-11-25 00:57:34 +02:00
my_lock.c
mysql_install_db.cc
fix CRLF line endings to LF
2011-04-08 01:42:47 +02:00
mysql_priv.h
Fix MySQL Bug #21978 : 'flush_time' value set for 1800 sec
2011-06-16 14:51:50 +02:00
mysql_upgrade_service.cc
- Properly terminate options array with all-zero entry.
2011-05-20 01:38:42 +02:00
mysqld.cc
Fix MySQL Bug #21978 : 'flush_time' value set for 1800 sec
2011-06-16 14:51:50 +02:00
mysqld_suffix.h
net_serv.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
opt_range.h
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
opt_sum.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
opt_table_elimination.cc
Change TABLE->alias to String for less memory reallocation
2011-02-28 12:48:50 +02:00
parse_file.cc
Fix for: LP #634955 : Assert in _ma_update_at_original_place()
2010-11-02 17:22:57 +02:00
parse_file.h
Change some my_bool in C++ classes and a few functions to bool to detect wrong usage of bool/my_bool.
2010-09-24 01:00:32 +03:00
partition_element.h
Merge with main
2011-02-22 20:28:01 +02:00
partition_info.cc
merge with 5.1
2010-09-11 20:43:48 +02:00
partition_info.h
fixed a valgrind warning in partition_pruning
2009-09-02 18:42:08 +03:00
password.c
pluggable auth with plugin examples
2010-03-29 17:13:53 +02:00
procedure.cc
procedure.h
The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.
2009-10-16 15:57:48 -07:00
protocol.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
protocol.h
pluggable auth with plugin examples
2010-03-29 17:13:53 +02:00
records.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
repl_failsafe.cc
Merge with MySQL 5.1.49
2010-08-02 12:01:24 +03:00
repl_failsafe.h
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
merge with 5.1
2010-09-11 20:43:48 +02:00
rpl_filter.h
MWL#36: Add a mysqlbinlog option to change the used database
2009-10-24 23:43:39 +04:00
rpl_injector.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
rpl_injector.h
rpl_mi.cc
Merge with MySQL 5.1.49
2010-08-02 12:01:24 +03:00
rpl_mi.h
Change some my_bool in C++ classes and a few functions to bool to detect wrong usage of bool/my_bool.
2010-09-24 01:00:32 +03:00
rpl_record.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
rpl_record.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
rpl_record_old.cc
rpl_record_old.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02: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
Fix build error (wrong printf-like format)
2011-03-28 02:02:24 +02:00
rpl_rli.h
Merge with MySQL 5.1.53
2010-11-25 00:57:34 +02:00
rpl_tblmap.cc
Bug#45613 handle failures from my_hash_insert
2009-11-20 16:18:01 +01:00
rpl_tblmap.h
rpl_utility.cc
BUG#49618: Field length stored incorrectly in binary log
2010-03-17 15:28:49 +01:00
rpl_utility.h
Merging with mysql-5.1-bugteam
2010-03-17 19:15:41 +01:00
scheduler.cc
Added protection around usage of thd->mysys_var
2009-11-26 22:19:33 +02:00
scheduler.h
Added mariadb and mariadb-version as my.conf option tags
2009-03-18 04:14:22 +02:00
set_var.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
set_var.h
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
slave.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
slave.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sp.cc
Change TABLE->alias to String for less memory reallocation
2011-02-28 12:48:50 +02:00
sp.h
Bug#45613 handle failures from my_hash_insert
2009-11-20 16:18:01 +01:00
sp_cache.cc
Merge MySQL 5.1.46 into MariaDB.
2010-04-28 14:52:24 +02:00
sp_cache.h
sp_head.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
sp_head.h
Bug#50755: Crash if stored routine def contains version comments
2010-04-01 10:15:22 -03:00
sp_pcontext.cc
merging
2009-04-29 07:59:10 +05:00
sp_pcontext.h
Manual merge.
2009-12-18 16:44:24 -02:00
sp_rcontext.cc
Merge Mariadb 5.1->5.2
2011-04-12 14:26:06 +02:00
sp_rcontext.h
Merge Mariadb 5.1->5.2
2011-04-12 14:26:06 +02:00
spatial.cc
Fix for bug #51875 : crash when loading data into geometry function polyfromwkb
2010-08-30 11:51:46 +04:00
spatial.h
Bug#42733: Type-punning warnings when compiling MySQL --
2010-07-14 16:39:40 -03:00
sql_acl.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
sql_acl.h
pluggable auth with plugin examples
2010-03-29 17:13:53 +02:00
sql_analyse.cc
Merge with MySQL 5.1.57/58
2011-05-02 20:58:45 +03:00
sql_analyse.h
Change some my_bool in C++ classes and a few functions to bool to detect wrong usage of bool/my_bool.
2010-09-24 01:00:32 +03:00
sql_array.h
sql_base.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
sql_binlog.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_bitmap.h
Change some my_bool in C++ classes and a few functions to bool to detect wrong usage of bool/my_bool.
2010-09-24 01:00:32 +03:00
sql_builtin.cc.in
Maria WL#61
2010-04-01 17:34:51 +03:00
sql_cache.cc
Fix compile error on Unixes
2011-05-14 18:59:06 +02:00
sql_cache.h
Change some my_bool in C++ classes and a few functions to bool to detect wrong usage of bool/my_bool.
2010-09-24 01:00:32 +03:00
sql_class.cc
Merge Mariadb 5.1->5.2
2011-04-12 14:26:06 +02:00
sql_class.h
fix noisy warnings in header files
2011-05-04 14:47:27 +02:00
sql_client.cc
sql_connect.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
sql_crypt.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_crypt.h
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_cursor.cc
Merge Mariadb 5.1->5.2
2011-04-12 14:26:06 +02:00
sql_cursor.h
sql_db.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_delete.cc
Merge Mariadb 5.1->5.2
2011-04-12 14:26:06 +02:00
sql_derived.cc
Fixed following problems:
2010-12-14 12:33:03 +03:00
sql_do.cc
sql_error.cc
MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge thread
2010-11-03 22:40:53 +01:00
sql_error.h
sql_handler.cc
Automatic merge with 5.1
2011-01-10 23:42:47 +02:00
sql_help.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
sql_insert.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
sql_lex.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
sql_lex.h
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
sql_list.cc
sql_list.h
Merge with MySQL 5.1.50
2010-08-27 17:12:44 +03:00
sql_load.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
sql_locale.cc
Bug#43207 wrong LC_TIME names for romanian locale
2009-10-19 13:41:52 +05: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
sql_map.h
sql_olap.cc
Bug#42733: Type-punning warnings when compiling MySQL --
2010-06-10 17:45:22 -03:00
sql_parse.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
sql_partition.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
sql_partition.h
BUG#49124 Security issue with /*!-versioned */ SQL statements on Slave
2010-07-29 11:00:57 +08:00
sql_plugin.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
sql_plugin.h
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
sql_plugin_services.h
lp:705210 - Compiling with BUILD/compile-pentium64-debug fails
2011-01-20 13:00:46 +01:00
sql_prepare.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
sql_profile.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_profile.h
Patch set contributed by Alex Budovski (MCA)
2010-01-29 20:42:22 +02:00
sql_rename.cc
Bugfix: New table creation/renaming block added if old encoded table present.
2011-05-11 14:09:48 +03:00
sql_repl.cc
Fix buildbot failure in rpl_stop_slave.test.
2011-05-09 15:06:16 +02:00
sql_repl.h
sql_select.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
sql_select.h
Merge with MySQL 5.1.57/58
2011-05-02 20:58:45 +03:00
sql_servers.cc
Fix for LP#588251: doStartTableScan() result not checked.
2010-07-17 01:41:44 +03:00
sql_servers.h
sql_show.cc
merge
2011-05-12 16:31:54 +02:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
sql_string.h
fix noisy warnings in header files
2011-05-04 14:47:27 +02:00
sql_table.cc
merge
2011-05-12 16:31:54 +02:00
sql_tablespace.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_test.cc
Change TABLE->alias to String for less memory reallocation
2011-02-28 12:48:50 +02:00
sql_trigger.cc
Merge with alias as String
2011-02-28 13:16:17 +02:00
sql_trigger.h
Fix for
2009-01-14 18:50:51 +04:00
sql_udf.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
sql_udf.h
sql_union.cc
Bug fix for lp:732124 union + limit returns wrong result
2011-03-09 19:45:48 +02:00
sql_update.cc
Merge Mariadb 5.1->5.2
2011-04-12 14:26:06 +02:00
sql_view.cc
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
sql_view.h
Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist(addon)
2009-04-13 18:09:10 +05:00
sql_yacc.yy
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
strfunc.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-09-23 15:21:29 +02:00
structs.h
small enhancement of the create table options feature:
2011-05-10 18:19:11 +02:00
table.cc
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
table.h
small enhancement of the create table options feature:
2011-05-10 18:19:11 +02:00
thr_malloc.cc
Merge with MariaDB 5.1.49
2010-08-05 22:56:11 +03:00
time.cc
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
tzfile.h
tztime.cc
Fixed memory overrun in mysql_tzinfo_to_sql
2011-05-26 18:35:26 +03:00
tztime.h
Backport of a 5.0.74 fix into 5.0.72sp1:
2009-01-12 17:40:29 +01:00
udf_example.c
Merge with MySQL 5.1.50
2010-08-27 17:12:44 +03:00
udf_example.def
Patch set contributed by Alex Budovski (MCA)
2010-01-29 20:42:22 +02:00
uniques.cc
Merge from 5.0-bugteam
2009-06-17 16:56:44 +02:00
unireg.cc
Merge with MariaDB 5.1.49
2010-08-05 22:56:11 +03:00
unireg.h
merge with 5.1
2010-09-11 20:43:48 +02:00
winservice.c
MWL#55 : Philip's review:
2011-02-15 13:04:55 +01:00
winservice.h
split long lines, use get_mysql_service_properties()
2011-01-30 22:42:02 +01:00