..
examples
Bug#473914: mysql_client_test fail with in debug compilaton on windows x64
2010-12-06 12:52:06 +01:00
share
virtual columns:
2010-12-31 10: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
2010-12-06 13:16:49 +01:00
contributors.h
create_options.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
create_options.h
MWL#43 CREATE TABLE options (by Sanja)
2010-04-08 14:10:05 +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
des_key_file.cc
discover.cc
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
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.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
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
event_queue.h
event_scheduler.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
event_scheduler.h
events.cc
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
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 5.1
2010-10-25 15:21:16 +02:00
field.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_conv.cc
Merge MySQL 5.1.46 into MariaDB.
2010-04-28 14:52:24 +02:00
filesort.cc
Fixed bug #607566 .
2010-07-19 22:41:24 -07:00
frm_crypt.cc
gen_lex_hash.cc
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
When compiling with valgrind, change my_alloca() to use my_malloc()
2010-12-13 15:05:57 +02:00
ha_partition.h
virtual columns:
2010-12-31 10:39:14 +01:00
handler.cc
Merge three Percona patches into mariadb-5.2-rpl:
2011-01-26 15:35:03 +01:00
handler.h
Merge three Percona patches into mariadb-5.2-rpl:
2011-01-26 15:35:03 +01: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
We are now using Valgrind rather than purify, and have for quite some time.
2009-05-06 14:03:24 +02:00
init.cc
item.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
item.h
merge with 5.1
2010-11-30 23:11:03 +02: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
merge with 5.1
2010-11-30 23:11:03 +02:00
item_cmpfunc.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
item_create.cc
Merge with MySQL 5.1.50
2010-08-27 17:12:44 +03:00
item_create.h
Merge MySQL 5.1.46 into MariaDB.
2010-04-28 14:52:24 +02:00
item_func.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
item_func.h
merge with 5.1
2010-11-30 23:11:03 +02:00
item_geofunc.cc
Manual merge of the fix for bug#43668.
2009-11-24 18:26:13 +03:00
item_geofunc.h
Fix for bug#56679: gis.test: valgrind error
2010-09-09 13:40:17 +04:00
item_row.cc
Bug#51598 Inconsistent behaviour with a COALESCE statement inside an IN comparison
2010-03-19 10:21:37 +04:00
item_row.h
merge 5.1->5.2
2010-06-01 21:52:20 +02:00
item_strfunc.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
item_strfunc.h
merge 5.1->5.2
2010-06-01 21:52:20 +02:00
item_subselect.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
item_subselect.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
item_sum.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
item_sum.h
merge with 5.1
2010-10-25 15:21:16 +02:00
item_timefunc.cc
Merge with MySQL 5.1.52
2010-11-23 23:39:59 +02:00
item_timefunc.h
merge with 5.1
2010-11-30 23:11:03 +02:00
item_xmlfunc.cc
merge 5.1->5.2
2010-02-01 08:14:12 +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 MySQL 5.1.53
2010-11-25 00:57:34 +02:00
log.cc
Merge three Percona patches into mariadb-5.2-rpl:
2011-01-26 15:35:03 +01:00
log.h
Merge three Percona patches into mariadb-5.2-rpl:
2011-01-26 15:35:03 +01:00
log_event.cc
Fix incorrect DBUG_ASSERT().
2011-01-26 14:25:34 +01:00
log_event.h
Merge
2011-01-10 14:54:26 +01:00
log_event_old.cc
merge with 5.1
2010-09-11 20:43:48 +02:00
log_event_old.h
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
Merge MariaDB 5.1->5.2
2010-11-19 22:33:47 +01:00
message.h
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
Bug#45288: pb2 returns a lot of compilation warnings on linux
2010-07-09 09:00:17 -03:00
my_decimal.h
Merge with MySQL 5.1.53
2010-11-25 00:57:34 +02:00
my_lock.c
mysql_priv.h
Merge Percona patch MWL#47 into mariadb 5.2-percona.
2011-01-10 14:53:09 +01:00
mysqld.cc
Merge three Percona patches into mariadb-5.2-rpl:
2011-01-26 15:35:03 +01:00
mysqld_suffix.h
net_serv.cc
Merge with MySQL 5.1.52
2010-11-23 23:39:59 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc
When compiling with valgrind, change my_alloca() to use my_malloc()
2010-12-13 15:05:57 +02:00
opt_range.h
merge with 5.1
2010-11-30 23:11:03 +02:00
opt_sum.cc
Merge with MariaDB 5.1.49
2010-08-05 22:56:11 +03:00
opt_table_elimination.cc
Merge with MariaDB 5.1.49
2010-08-05 22:56:11 +03: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
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
Automatic merge with MariaDB 5.1
2010-11-04 17:08:28 +02:00
protocol.h
pluggable auth with plugin examples
2010-03-29 17:13:53 +02:00
records.cc
Automatic merge with 5.1
2010-10-06 13:11:06 +03:00
repl_failsafe.cc
Merge with MySQL 5.1.49
2010-08-02 12:01:24 +03:00
repl_failsafe.h
rpl_constants.h
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 MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01: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 of innodb_plugin for MySQL 5.1.53 with xtradb
2010-11-25 15:11:37 +02: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_record_old.cc
rpl_record_old.h
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
Merge Percona patch MWL#47 into mariadb 5.2-percona.
2011-01-10 14:53:09 +01:00
rpl_rli.h
Merge Percona patch MWL#47 into mariadb 5.2-percona.
2011-01-10 14:53:09 +01: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 Percona patch MWL#47 into mariadb 5.2-percona.
2011-01-10 14:53:09 +01:00
set_var.h
merge with 5.1
2010-09-11 20:43:48 +02:00
slave.cc
Merge Percona patch MWL#47 into mariadb 5.2-percona.
2011-01-10 14:53:09 +01:00
slave.h
Merge Percona patch MWL#47 into mariadb 5.2-percona.
2011-01-10 14:53:09 +01:00
sp.cc
Merge MariaDB 5.1->5.2
2010-11-19 22:33:47 +01: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
2010-09-11 20:43:48 +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
Bug#34384: Slow down on constant conversion.
2009-11-06 22:34:25 +03:00
sp_rcontext.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
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
bug#683112 Maria 5.2 incorrectly reports "(using password: NO)" even when password is specified
2010-12-20 19:19:24 +01:00
sql_acl.h
pluggable auth with plugin examples
2010-03-29 17:13:53 +02:00
sql_analyse.cc
Bug#45288: pb2 returns a lot of compilation warnings on linux
2010-07-09 09:00:17 -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 5.1
2010-11-30 23:11:03 +02:00
sql_binlog.cc
Merge Percona patch MWL#47 into mariadb 5.2-percona.
2011-01-10 14:53:09 +01: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
merge with 5.1
2010-11-30 23:11:03 +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 MWL#116 into mariadb-5.2-rpl.
2010-12-25 15:42:33 +01:00
sql_class.h
Merge three Percona patches into mariadb-5.2-rpl:
2011-01-26 15:35:03 +01:00
sql_client.cc
sql_connect.cc
Fix that one can run mysql_upgrade with long table names
2010-09-03 19:20:30 +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 with 5.1
2010-09-11 20:43:48 +02:00
sql_cursor.h
sql_db.cc
Merge with MySQL 5.1.53
2010-11-25 00:57:34 +02:00
sql_delete.cc
Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable things that are proven stable or enable things that are not usefull.
2010-09-23 19:30:44 +03:00
sql_derived.cc
Bug#42733: Type-punning warnings when compiling MySQL --
2010-06-10 17:45:22 -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
Merge with MariaDB 5.1.49
2010-08-05 22:56:11 +03:00
sql_help.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
sql_insert.cc
Merge Percona patch MWL#47 into mariadb 5.2-percona.
2011-01-10 14:53:09 +01:00
sql_lex.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
sql_lex.h
merge with 5.1
2010-10-25 15:21:16 +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 MySQL 5.1.52
2010-11-23 23:39:59 +02:00
sql_locale.cc
Bug#43207 wrong LC_TIME names for romanian locale
2009-10-19 13:41:52 +05:00
sql_manager.cc
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 MWL#116 into mariadb-5.2-rpl.
2010-12-25 15:42:33 +01:00
sql_partition.cc
merge with 5.1
2010-11-30 23:11:03 +02: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
merged
2010-09-21 16:24:03 +02:00
sql_plugin.h
--plugin_maturity command-line option
2010-06-16 19:01:22 +02:00
sql_plugin_services.h
mwl:98 - libservices
2010-03-03 15:44:14 +01:00
sql_prepare.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
sql_profile.cc
Merge MySQL 5.1.46 into MariaDB.
2010-04-28 14:52:24 +02:00
sql_profile.h
Patch set contributed by Alex Budovski (MCA)
2010-01-29 20:42:22 +02:00
sql_rename.cc
Backport Bug#37148 to 5.1
2010-01-24 15:03:23 +08:00
sql_repl.cc
Fix two compiler warnings from Buildbot (including one bad merge).
2011-01-11 09:06:54 +01:00
sql_repl.h
sql_select.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
sql_select.h
5.1.51 merge
2010-10-19 15:58:35 +02: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 MariaDB 5.1->5.2
2010-11-19 22:33:47 +01:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
bugfix: engine defined table options were not showing up in INFORMATION_SCHEMA.TABLES.CREATE_OPTIONS
2010-10-24 20:47:01 +02:00
sql_string.h
merge with 5.1
2010-11-30 23:11:03 +02:00
sql_table.cc
virtual columns:
2010-12-31 10:39:14 +01:00
sql_tablespace.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_test.cc
sane implementation of Key_% status variables.
2010-10-29 20:29:43 +02:00
sql_trigger.cc
Merge with MySQL 5.1.52
2010-11-23 23:39:59 +02:00
sql_trigger.h
sql_udf.cc
merge with 5.1
2010-09-11 20:43:48 +02:00
sql_udf.h
sql_union.cc
Merge with MySQL 5.1.53
2010-11-25 00:57:34 +02:00
sql_update.cc
merge with 5.1
2010-11-30 23:11:03 +02:00
sql_view.cc
merge with 5.1
2010-09-11 20:43:48 +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
2010-11-30 23:11:03 +02:00
strfunc.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-09-23 15:21:29 +02:00
structs.h
MWL#43 CREATE TABLE options (by Sanja)
2010-04-08 14:10:05 +02:00
table.cc
virtual columns:
2010-12-31 10:39:14 +01:00
table.h
merge with 5.1
2010-11-30 23:11:03 +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
merge with 5.1
2010-10-25 15:21:16 +02:00
tztime.h
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