mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 12:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity
mariadb/sql
History
unknown f65e5841d7 Fix for MDEV-3948, and backport of the following collection of fixes and backports 
from MariaDB 10.0.
  
The bug in mdev-3948 was an instance of the problem fixed by Sergey's patch
in 10.0 - namely that the range optimizer could change table->[read | write]_set,
and not restore it.
  
revno: 3471
committer: Sergey Petrunya <psergey@askmonty.org>
branch nick: 10.0-serg-fix-imerge
timestamp: Sat 2012-11-03 12:24:36 +0400
message:
  # MDEV-3817: Wrong result with index_merge+index_merge_intersection, InnoDB table, join, AND and OR conditions
  Reconcile the fixes from:
  #
  # guilhem.bichot@oracle.com-20110805143029-ywrzuz15uzgontr0
  # Fix for BUG#12698916 - "JOIN QUERY GIVES WRONG RESULT AT 2ND EXEC. OR
  # AFTER FLUSH TABLES [-INT VS NULL]"
  #
  # guilhem.bichot@oracle.com-20111209150650-tzx3ldzxe1yfwji6
  # Fix for BUG#12912171 - ASSERTION FAILED: QUICK->HEAD->READ_SET == SAVE_READ_SET
  # and
  #
  and related fixes from: BUG#1006164, MDEV-376:
  
  Now, ROR-merged QUICK_RANGE_SELECT objects make no assumptions about the values
  of table->read_set and table->write_set.
  Each QUICK_ROR_SELECT has (and had before) its own column bitmap, but now, all 
  QUICK_ROR_SELECT's functions that care: reset(), init_ror_merged_scan(), and 
  get_next()  will set table->read_set when invoked and restore it back to what 
  it was before the call before they return.

  This allows to avoid the mess when somebody else modifies table->read_set for 
  some reason.
2013-01-28 15:13:39 +02:00
..
examples
share Merge MariaDB 5.1.66 -> 5.2 -> 5.3 2012-11-09 10:11:20 +02:00
add_errmsg
authors.h
client_settings.h
CMakeLists.txt Fix Windows installers' bootstrapper scripts , after mysql_performance_tables.sql was split off mysql_system_tables.sql 2013-01-18 18:49:07 +01:00
contributors.h
create_options.cc 5.3 merge 2012-10-18 23:33:06 +02:00
create_options.h
custom_conf.h
datadict.cc
datadict.h
debug_sync.cc
debug_sync.h
derror.cc Better error message when using --language or --log-bin 2012-09-07 17:05:17 +03:00
derror.h
des_key_file.cc
des_key_file.h
discover.cc
discover.h
event_data_objects.cc
event_data_objects.h
event_db_repository.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
event_db_repository.h
event_parse_data.cc
event_parse_data.h
event_queue.cc
event_queue.h
event_scheduler.cc Added new status variables: 2012-09-09 01:22:06 +03:00
event_scheduler.h
events.cc
events.h
field.cc 5.3 merge 2013-01-28 13:36:05 +01:00
field.h 5.3 merge 2013-01-28 13:36:05 +01:00
field_conv.cc mysql-5.5 merge 2012-06-14 20:05:31 +02:00
filesort.cc 5.3 merge 2013-01-28 13:36:05 +01:00
filesort.h
frm_crypt.cc
frm_crypt.h
gcalc_slicescan.cc bug #977021 ST_BUFFER fails with the negative D. 2012-04-29 18:08:11 +05:00
gcalc_slicescan.h
gcalc_tools.cc
gcalc_tools.h
gen_lex_hash.cc Merge MySQL 5.1.66 -> MariaDB 5.1.65 2012-11-06 11:52:55 +02:00
gstream.cc
gstream.h
ha_ndbcluster.cc
ha_ndbcluster.h
ha_ndbcluster_binlog.cc 5.3 merge 2013-01-15 19:07:46 +01:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
ha_partition.h mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
handler.cc MDEV-4065 thd_kill_statement service 2013-01-18 19:04:23 +01:00
handler.h MDEV-4065 thd_kill_statement service 2013-01-18 19:04:23 +01:00
hash_filo.cc
hash_filo.h
hostname.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
hostname.h
init.cc
init.h
innodb_priv.h 5.3 merge 2012-05-04 07:16:38 +02:00
item.cc backport of: 2013-01-17 13:53:15 +02:00
item.h MDEV-4029 SELECT on information_schema using a subquery locks up the information_schema table due to incorrect mutexes handling 2013-01-20 00:46:51 +01:00
item_buff.cc
item_cmpfunc.cc 5.3 merge 2013-01-15 19:07:46 +01:00
item_cmpfunc.h backport of: 2013-01-17 13:53:15 +02:00
item_create.cc
item_create.h
item_func.cc Merge 5.3->5.5 2013-01-23 15:18:05 -08:00
item_func.h Merge 5.3->5.5 2013-01-23 15:18:05 -08:00
item_geofunc.cc 5.3 merge 2013-01-15 19:07:46 +01:00
item_geofunc.h 5.3 merge 2013-01-15 19:07:46 +01:00
item_row.cc 5.3 merge 2013-01-28 13:36:05 +01:00
item_row.h
item_strfunc.cc 5.3 merge 2013-01-28 13:36:05 +01:00
item_strfunc.h 5.3 merge 2013-01-15 19:07:46 +01:00
item_subselect.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
item_subselect.h MDEV-3812: Remove unneeded extra call to engine->exec() in Item_subselect::exec, remove enum store_key_result 2012-10-25 15:50:10 +03:00
item_sum.cc Merge 5.3->5.5 2013-01-23 15:18:05 -08:00
item_sum.h non-functional cleanup, clarifying CONVERT_IF_BIGGER_TO_BLOB 2013-01-07 20:21:05 +01:00
item_timefunc.cc 5.3 merge 2013-01-15 19:07:46 +01:00
item_timefunc.h 5.3 merge 2013-01-15 19:07:46 +01:00
item_xmlfunc.cc 5.3 merge 2013-01-15 19:07:46 +01:00
item_xmlfunc.h 5.3 merge 2013-01-15 19:07:46 +01:00
key.cc
key.h
keycaches.cc
keycaches.h
lex.h Added function last_value() which returns the last value but evalutes all arguments as a side effect. 2012-09-05 18:23:51 +03:00
lex_symbol.h
lock.cc MDEV-254: Server hang with FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT 2012-05-08 14:27:44 +02:00
lock.h
log.cc MDEV-633 lp:1024058 - mysqld XA crash in replication slave 2013-01-18 19:10:20 +01:00
log.h 5.3->5.5 merge 2012-11-22 10:19:31 +01:00
log_event.cc 5.3 merge 2013-01-15 19:07:46 +01:00
log_event.h 5.3 merge 2013-01-15 19:07:46 +01:00
log_event_old.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
log_event_old.h merge from 5.2 2012-08-24 14:02:32 +02:00
log_slow.h
main.cc
mdl.cc Fixed some race conditons and bugs related to killed queries 2013-01-11 00:22:14 +02:00
mdl.h Bug #15948123: SERVER WORKS INCORRECT WITH LONG TABLE ALIASES 2012-12-05 20:47:21 +04:00
mem_root_array.h
message.h
message.mc
message.rc
mf_iocache.cc
MSG00001.bin
multi_range_read.cc Fixed compiler errors 2012-08-14 19:59:28 +03:00
multi_range_read.h
my_decimal.cc
my_decimal.h
mysql_install_db.cc MDEV-393. Remove --loose-pbxt=OFF/loose-skip-pbxt from bootstrapper calls to avoid "unknown parameter" warning 2012-07-12 15:32:35 +02:00
mysql_upgrade_service.cc
mysqld.cc 5.3 merge 2013-01-15 19:07:46 +01:00
mysqld.h Buildbot fixes and cleanups: 2013-01-11 02:03:43 +02:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_index_cond_pushdown.cc
opt_range.cc Fix for MDEV-3948, and backport of the following collection of fixes and backports 2013-01-28 15:13:39 +02:00
opt_range.h Fix for MDEV-3948, and backport of the following collection of fixes and backports 2013-01-28 15:13:39 +02:00
opt_range_mrr.cc MDEV-3934 Assertion `((keypart_map+1) & keypart_map) == 0' failed in _mi_pack_key with an index on a POINT column 2013-01-20 14:06:33 +01:00
opt_subselect.cc non-functional cleanup, clarifying CONVERT_IF_BIGGER_TO_BLOB 2013-01-07 20:21:05 +01:00
opt_subselect.h 5.3 merge 2012-05-04 07:16:38 +02:00
opt_sum.cc Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH 2012-10-08 19:40:30 +05:30
opt_table_elimination.cc
parse_file.cc 5.3 merge 2012-05-04 07:16:38 +02:00
parse_file.h 5.3 merge 2012-05-04 07:16:38 +02:00
partition_element.h
partition_info.cc
partition_info.h
password.c mysql-5.5 merge 2012-06-14 20:05:31 +02:00
plistsort.c
procedure.cc
procedure.h
protocol.cc 5.2 merge. 2012-08-22 16:45:25 +02:00
protocol.h
records.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
records.h
repl_failsafe.cc Merge from 5.3 2012-08-24 15:29:01 +02:00
repl_failsafe.h
replication.h
rpl_constants.h
rpl_filter.cc
rpl_filter.h
rpl_handler.cc
rpl_handler.h
rpl_injector.cc
rpl_injector.h
rpl_mi.cc
rpl_mi.h Fixed MDEV-4013: Password length in replication setup 2013-01-11 00:35:33 +02:00
rpl_record.cc Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE to be able to distingus if a .frm file is missing or if the table is missing in the engine. 2012-08-28 19:39:49 +03:00
rpl_record.h
rpl_record_old.cc
rpl_record_old.h
rpl_reporting.cc
rpl_reporting.h
rpl_rli.cc Buildbot fixes and cleanups: 2013-01-11 02:03:43 +02:00
rpl_rli.h 5.2 merge. 2012-08-22 16:45:25 +02:00
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc 5.3 merge 2012-08-27 18:13:17 +02:00
rpl_utility.h merge with MySQL 5.1.65 2012-08-22 11:40:39 +02:00
scheduler.cc MDEV-3945 - do not hold LOCK_thread_count when freeing THD. 2012-12-21 00:12:37 +01:00
scheduler.h MDEV-531 : Warning: Forcing close of thread ... in rpl_binlog_index 2012-11-02 10:43:52 +01:00
set_var.cc mysql-5.5.28 2012-10-16 13:04:42 +02:00
set_var.h mysql-5.5.28 2012-10-16 13:04:42 +02:00
sha2.cc
signal_handler.cc MDEV-419 ensure that all HAVE_XXX constants can be set by cmake 2012-07-31 19:29:07 +02:00
slave.cc 5.2 merge. 2012-08-22 16:45:25 +02:00
slave.h
sp.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
sp_rcontext.h mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
spatial.cc Merge MariaDB 5.1.66 -> 5.2 -> 5.3 2012-11-09 10:11:20 +02:00
spatial.h Merge MariaDB 5.1.66 -> 5.2 -> 5.3 2012-11-09 10:11:20 +02:00
sql_acl.cc 5.3 merge 2013-01-25 11:24:42 +01:00
sql_acl.h
sql_admin.cc Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE to be able to distingus if a .frm file is missing or if the table is missing in the engine. 2012-08-28 19:39:49 +03:00
sql_admin.h
sql_alter.cc
sql_alter.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_audit.cc Test case and a different fix for MySQL bug#14485479 2013-01-15 19:16:29 +01:00
sql_audit.h Test case and a different fix for MySQL bug#14485479 2013-01-15 19:16:29 +01:00
sql_base.cc Merge 5.3->5.5 2013-01-23 15:18:05 -08:00
sql_base.h Implemented MDEV-3941: CREATE TABLE xxx IF NOT EXISTS should not block if table exists. 2012-12-16 16:13:17 +02:00
sql_binlog.cc
sql_binlog.h
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Fix for bug lp:1039277 "Crash in sql_cache.cc". 2012-08-21 08:46:32 +03:00
sql_cache.h fixed MySQL bug#53775: 2012-07-13 22:17:32 +03:00
sql_callback.h
sql_class.cc 5.3 merge 2013-01-25 11:24:42 +01:00
sql_class.h 5.3 merge 2013-01-25 11:24:42 +01:00
sql_client.cc
sql_connect.cc 5.3 merge 2013-01-15 19:07:46 +01:00
sql_connect.h Bug#14003080:65104: MAX_USER_CONNECTIONS WITH PROCESSLIST EMPTY 2012-05-28 11:14:43 +05:30
sql_const.h non-functional cleanup, clarifying CONVERT_IF_BIGGER_TO_BLOB 2013-01-07 20:21:05 +01:00
sql_crypt.cc
sql_crypt.h
sql_cursor.cc Fix for bug lp:1039277 "Crash in sql_cache.cc". 2012-08-21 08:46:32 +03:00
sql_cursor.h
sql_db.cc 5.3 merge 2013-01-15 19:07:46 +01:00
sql_db.h
sql_delete.cc 5.3->5.5 merge 2012-11-22 10:19:31 +01:00
sql_delete.h
sql_derived.cc
sql_derived.h
sql_do.cc
sql_do.h
sql_error.cc
sql_error.h
sql_expression_cache.cc
sql_expression_cache.h
sql_handler.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
sql_handler.h
sql_help.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
sql_help.h
sql_hset.h
sql_insert.cc 5.3 merge 2013-01-28 13:36:05 +01:00
sql_insert.h
sql_join_cache.cc 5.3 merge 2012-10-18 23:33:06 +02:00
sql_join_cache.h
sql_lex.cc 5.3 merge 2013-01-15 19:07:46 +01:00
sql_lex.h 5.2 merge. 2012-08-22 16:45:25 +02:00
sql_lifo_buffer.h
sql_list.cc
sql_list.h 5.3 merge 2013-01-15 19:07:46 +01:00
sql_load.cc small cleanups 2013-01-15 19:16:18 +01:00
sql_load.h
sql_locale.cc
sql_locale.h
sql_manager.cc
sql_manager.h
sql_parse.cc 5.3 merge 2013-01-25 11:24:42 +01:00
sql_parse.h
sql_partition.cc Fixed MDEV-365 "Got assertion when doing alter table on a partition" 2012-08-15 13:33:37 +03:00
sql_partition.h
sql_partition_admin.cc
sql_partition_admin.h
sql_plist.h
sql_plugin.cc MDEV-4065 thd_kill_statement service 2013-01-18 19:04:23 +01:00
sql_plugin.h merge with MySQL 5.5.27 2012-08-09 17:22:00 +02:00
sql_plugin_services.h MDEV-4065 thd_kill_statement service 2013-01-18 19:04:23 +01:00
sql_prepare.cc 5.3->5.5 merge 2012-11-22 10:19:31 +01:00
sql_prepare.h
sql_priv.h 5.3 merge 2013-01-15 19:07:46 +01:00
sql_profile.cc 5.3 merge 2013-01-15 19:07:46 +01:00
sql_profile.h 5.3 merge 2013-01-15 19:07:46 +01:00
sql_reload.cc 5.3 merge 2012-05-21 20:54:41 +02:00
sql_reload.h
sql_rename.cc
sql_rename.h
sql_repl.cc Fixed MDEV-4013: Password length in replication setup 2013-01-11 00:35:33 +02:00
sql_repl.h Fixed MDEV-4013: Password length in replication setup 2013-01-11 00:35:33 +02:00
sql_select.cc 5.3 merge 2013-01-28 13:36:05 +01:00
sql_select.h Fix of MDEV-3874: Server crashes in Item_field::print on a SELECT from a MERGE view with materialization+semijoin, subquery, ORDER BY. 2012-11-26 21:22:44 +02:00
sql_servers.cc
sql_servers.h
sql_show.cc Merge 5.2->5.3 2013-01-21 21:29:19 -08:00
sql_show.h 5.3 merge 2012-10-18 23:33:06 +02:00
sql_signal.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
sql_signal.h
sql_sort.h
sql_state.c Fix for MDEV-533: Confusing error code when doing auto-increment insert for out-of-range values 2012-09-18 15:14:19 +03:00
sql_string.cc Merge from 5.3 2012-08-24 15:29:01 +02:00
sql_string.h Merge MariaDB 5.1.66 -> 5.2 -> 5.3 2012-11-09 10:11:20 +02:00
sql_table.cc Fixed the CREATE TABLE IF EXIST generates warnings instead of errors 2012-12-17 22:34:56 +02:00
sql_table.h
sql_tablespace.cc
sql_tablespace.h
sql_test.cc
sql_test.h
sql_time.cc 5.3 merge 2013-01-15 19:07:46 +01:00
sql_time.h 5.3 merge 2012-08-31 14:15:52 +02:00
sql_trigger.cc Added new status variables: 2012-09-09 01:22:06 +03:00
sql_trigger.h
sql_truncate.cc Fixed MDEV-3890: Server crash inserting record on a temporary table after truncating it 2013-01-25 21:40:42 +02:00
sql_truncate.h
sql_udf.cc
sql_udf.h
sql_union.cc Fixed some race conditons and bugs related to killed queries 2013-01-11 00:22:14 +02:00
sql_union.h
sql_update.cc Fix for MDEV-3948, and backport of the following collection of fixes and backports 2013-01-28 15:13:39 +02:00
sql_update.h
sql_view.cc 5.3 merge 2012-05-04 07:16:38 +02:00
sql_view.h
sql_yacc.yy mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
strfunc.cc
strfunc.h
structs.h
sys_vars.cc 5.3 merge 2012-10-18 23:33:06 +02:00
sys_vars.h mysql-5.5.28 2012-10-16 13:04:42 +02:00
sys_vars_shared.h
table.cc Merge 5.3->5.5 2013-01-23 15:18:05 -08:00
table.h Merge 5.3->5.5 2013-01-23 15:18:05 -08:00
thr_malloc.cc
thr_malloc.h
threadpool.h
threadpool_common.cc MDEV-3945 - do not hold LOCK_thread_count when freeing THD. 2012-12-21 00:12:37 +01:00
threadpool_unix.cc MDEV-531 : Warning: Forcing close of thread ... in rpl_binlog_index 2012-11-02 10:43:52 +01:00
threadpool_win.cc MDEV-531 : Warning: Forcing close of thread ... in rpl_binlog_index 2012-11-02 10:43:52 +01:00
transaction.cc
transaction.h
tzfile.h
tztime.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
tztime.h
udf_example.c
udf_example.def
uniques.cc Merge 5.3->5.5 2013-01-23 15:18:05 -08:00
unireg.cc Merge 5.3->5.5. 2012-06-24 09:10:11 -07:00
unireg.h fix compile error, when building with oqgraph 2012-06-25 18:17:24 +02:00
winservice.c
winservice.h