VladPolskiy/MariaDB-open-code
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 11:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
58bb0769bdf13a9747e900aa2f0955137738ce9d
MariaDB-open-code/sql
History
Michael Widenius 58bb0769bd Merge with MySQL 5.1.55 
- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria"
- Fixed wrong assert in Aria

Now need to merge with latest xtradb before pushing 

sql/ha_partition.cc:
  Ensure that m_ordered_rec_buffer is not freed before close.
sql/mysqld.cc:
  Changed to use opt_stack_trace instead of opt_pstack.
  Removed references to pstack
sql/partition_element.h:
  Ensure that connect_string is initialized
storage/maria/ma_key_recover.c:
  Fixed wrong assert
2011-02-20 18:51:43 +02:00
..
examples
Bug#473914: mysql_client_test fail with in debug compilaton on windows x64
2010-12-06 12:52:06 +01:00
share
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
.cvsignore
…
add_errmsg
…
authors.h
Bug#50561: ALTER PARTITIONS does not have adequate lock, breaks with
2010-03-17 15:10:41 +01:00
client_settings.h
…
CMakeLists.txt
Bug#473914: mysql_client_test fail with in debug compilaton on windows x64
2010-12-06 12:52:06 +01:00
contributors.h
…
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 MySQL 5.1.49
2010-08-02 12:01:24 +03:00
event_data_objects.h
…
event_db_repository.cc
Bug #49132 Replication failure on temporary table + DDL
2010-01-22 17:38:21 +08:00
event_db_repository.h
…
event_parse_data.cc
…
event_parse_data.h
…
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
Merge MySQL 5.1.46 into MariaDB.
2010-04-28 14:52:24 +02:00
events.h
…
field_conv.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
field.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
field.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
filesort.cc
Bug #54734 assert in Diagnostics_area::set_ok_status
2010-07-19 11:03:52 +02:00
frm_crypt.cc
…
gen_lex_hash.cc
Merge
2010-12-29 00:47:05 +01:00
gstream.cc
…
gstream.h
…
ha_ndbcluster_binlog.cc
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
ha_ndbcluster_binlog.h
…
ha_ndbcluster_cond.cc
…
ha_ndbcluster_cond.h
…
ha_ndbcluster_tables.h
…
ha_ndbcluster.cc
Merge with MySQL 5.1.53
2010-11-25 00:57:34 +02:00
ha_ndbcluster.h
restore the unintentinally broken ABI
2010-07-23 22:37:21 +02:00
ha_partition.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
ha_partition.h
Applied patch for lp:585688 "maridb crashes in federatedx code" from lp:~atcurtis/maria/federatedx:
2011-02-10 22:40:59 +02:00
handler.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
handler.h
Fix for LP#697610 ha_index_prev(uchar*): Assertion `inited==INDEX' failed with HANDLER + InnoDB in maria-5.3
2011-01-12 15:41:39 +02:00
hash_filo.cc
Fix a bunch of Windows warnings
2010-04-21 02:25:59 +02:00
hash_filo.h
…
hostname.cc
…
init.cc
…
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 MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_cmpfunc.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +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 MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_func.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02: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
Bug#51598 Inconsistent behaviour with a COALESCE statement inside an IN comparison
2010-03-19 10:21:37 +04:00
item_strfunc.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_strfunc.h
Merge MySQL 5.1.46 into MariaDB.
2010-04-28 14:52:24 +02:00
item_subselect.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_subselect.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_sum.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_sum.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_timefunc.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_timefunc.h
Bug#54483: valgrind errors when making warnings for
2010-12-22 15:45:17 +01:00
item_xmlfunc.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item_xmlfunc.h
…
item.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
item.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
key.cc
…
lex_symbol.h
…
lex.h
…
lock.cc
Fixed bugs found by buildbot:
2011-01-26 15:17:46 +02:00
log_event_old.cc
Merge with MySQL 5.1.50
2010-08-27 17:12:44 +03:00
log_event_old.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
log_event.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
log_event.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
log_slow.h
…
log.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
log.h
BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error
2010-11-30 23:32:51 +00:00
Makefile.am
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +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_priv.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
mysqld_suffix.h
…
mysqld.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
net_serv.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
opt_range.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
opt_sum.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
opt_table_elimination.cc
LPBUG#523593: Running RQG optimizer_no_subquery crashes MariaDB
2010-02-18 15:03:52 +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
…
partition_element.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
partition_info.cc
Bug#45288: pb2 returns a lot of compilation warnings on linux
2010-07-20 15:07:36 -03:00
partition_info.h
…
password.c
…
procedure.cc
…
procedure.h
…
protocol.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
protocol.h
…
records.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +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
…
rpl_filter.cc
Fix that one can run mysql_upgrade with long table names
2010-09-03 19:20:30 +03:00
rpl_filter.h
…
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
BUG#53657: Slave crashed with error 22 when trying to lock mutex
2010-05-24 17:43:27 +01:00
rpl_record_old.cc
…
rpl_record_old.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02: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_reporting.cc
…
rpl_reporting.h
…
rpl_rli.cc
Merge with MySQL 5.1.50
2010-08-27 17:12:44 +03: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
…
set_var.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
set_var.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
slave.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
slave.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02: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 MySQL 5.1.55
2011-02-20 18:51:43 +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
…
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
…
sp.cc
Fixed bug discovered by testcase for LP#618558 (original bug seams to be fixed):
2010-11-15 22:44:41 +02:00
sp.h
Bug#45613 handle failures from my_hash_insert
2009-11-20 16:18:01 +01: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 MySQL 5.1.53
2010-11-25 00:57:34 +02:00
sql_acl.h
Bug#41726: upgrade from 5.0 to 5.1.30 crashes if you didn't run mysql_upgrade
2009-11-21 09:18:21 -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
…
sql_array.h
…
sql_base.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_binlog.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_bitmap.h
…
sql_builtin.cc.in
Remove compiler warnings (Including some warnings from -Wstrict-aliasing)
2009-11-30 01:08:56 +02:00
sql_cache.cc
Merge with MySQL 5.1.52
2010-11-23 23:39:59 +02:00
sql_cache.h
Bug#39253 Large query cache still freezes server after fix for bug #21074
2009-11-20 13:49:06 +01:00
sql_class.cc
Automatic merge with 5.1
2010-11-25 22:41:38 +02:00
sql_class.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_client.cc
…
sql_connect.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02: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
Fixed bug #42496 - the server could crash on a debug assert after a failure
2010-07-21 14:56:43 +07: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 with MySQL 5.1.49
2010-08-02 12:01:24 +03: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
- Fixed that Aria works with HANDLER commands
2011-01-10 23:22:40 +02:00
sql_help.cc
Merge with MySQL 5.1.53
2010-11-25 00:57:34 +02:00
sql_insert.cc
Merge with MySQL 5.1.53
2010-11-25 00:57:34 +02:00
sql_lex.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_lex.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +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.55
2011-02-20 18:51:43 +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 with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_partition.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +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
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_plugin.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_prepare.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02: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
A fix and a test case for Bug#47924 -main.log_tables times out
2010-11-07 23:42:54 +06:00
sql_repl.cc
Merge with MySQL 5.1.50
2010-08-27 17:12:44 +03:00
sql_repl.h
…
sql_select.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_select.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_servers.cc
Bug#33982 debug assertion and crash reloading grant tables after sighup or kill
2010-01-13 12:39:00 +01:00
sql_servers.h
…
sql_show.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_show.h
…
sql_sort.h
…
sql_state.c
…
sql_string.cc
Bug#45288: pb2 returns a lot of compilation warnings on linux
2010-07-09 09:00:17 -03:00
sql_string.h
Merge with MySQL 5.1.53
2010-11-25 00:57:34 +02:00
sql_table.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_tablespace.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_test.cc
Bug #50271: Debug output of JOIN structures is garbled
2010-01-28 12:10:57 +01: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 MySQL 5.1.55
2011-02-20 18:51:43 +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 MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_view.cc
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
sql_view.h
…
sql_yacc.yy
Applied patch for lp:585688 "maridb crashes in federatedx code" from lp:~atcurtis/maria/federatedx:
2011-02-10 22:40:59 +02:00
strfunc.cc
…
structs.h
A fix and a test case for
2009-11-03 20:45:52 +03:00
table.cc
Bug#56380: valgrind memory leak warning from partition tests
2010-12-01 12:20:46 +01:00
table.h
Merge with MySQL 5.1.55
2011-02-20 18:51:43 +02:00
thr_malloc.cc
Bug #42064: low memory crash when importing hex strings, in
2010-05-21 15:23:48 +04:00
time.cc
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
tzfile.h
…
tztime.cc
5.1.51 merge
2010-10-19 15:58:35 +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
…
unireg.cc
Merge with MySQL 5.1.49
2010-08-02 12:01:24 +03:00
unireg.h
Merge with MySQL 5.1.50
2010-08-27 17:12:44 +03:00