mariadb/sql
Vladislav Vaintroub 97aa8e8c0a LPBUG#983285 - incompatibility in frm in case of VIEWs with non-default ALGORITHM option.
As part of derived tables redesign, values for VIEW_ALGORITHM_MERGE and VIEW_ALGORITHM_TMPTABLE have changed from (former values 1 rsp 2 , new values 5 rsp 9).

This lead to the problem that views, created with version 5.2  or earlier would not work in all situations  (e.g "SHOW CREATE VIEW"), or with mysqldump.

The fix is to restore backward compatibility for the from file, and convert algorithm={1,2} in the frm to {5,9} when reading .frm from disk, and store backward compatible values when writing from to disk. 

Also allow processing correct processing for "invalid" .frms created with MariaDB 5.3/5.5 GA releases (where algorithm stored in memory matched the one stored in frm).
2012-04-20 21:09:16 +02:00
..
examples Updated/added copyright headers 2011-06-30 17:31:31 +02:00
share Fixed that 'make distcheck' works with automake 1.11.11 2012-02-21 17:58:43 +02:00
.cvsignore
add_errmsg
authors.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
client_settings.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
CMakeLists.txt merge 2012-04-05 23:07:18 +02: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 Merge with 5.2. 2011-12-11 11:34:44 +02:00
debug_sync.h Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
derror.cc Merge with 5.2. 2011-12-11 11:34:44 +02: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 5.2. 2011-12-11 11:34:44 +02: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 5.2. 2011-12-11 11:34:44 +02:00
event_db_repository.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
event_parse_data.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
event_parse_data.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
event_queue.cc Merge with 5.1-microseconds 2011-05-28 05:11:32 +03:00
event_queue.h wl#173 - temporal types with sub-second resolution 2011-03-01 13:24:36 +01:00
event_scheduler.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
event_scheduler.h
events.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +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 Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" 2012-03-13 16:38:43 +02:00
field.h Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" 2012-03-13 16:38:43 +02:00
field_conv.cc merge 2012-04-05 23:07:18 +02:00
filesort.cc merge 2012-04-05 23:07:18 +02:00
frm_crypt.cc
gcalc_slicescan.cc GIS issues fixed. 2011-12-16 10:21:46 +04:00
gcalc_slicescan.h bug #901655 ST_BUFFER asserts with a coplicated shape. 2011-12-08 16:29:45 +04:00
gcalc_tools.cc GIS issues fixed. 2011-12-16 10:21:46 +04:00
gcalc_tools.h Fix for bug #809849 spatial operations must be KILL-able. 2011-11-20 12:30:43 +04:00
gen_lex_hash.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
gstream.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
gstream.h fix for bug 848926 GIS functions return "GEOMETRYCOLLECTION()" instead of "GEOMETRYCOLLECTION EMPTY" 2011-09-21 12:50:03 +05:00
ha_ndbcluster.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
ha_ndbcluster.h Merge 5.2->5.3 2010-10-10 17:18:11 +03:00
ha_ndbcluster_binlog.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc Automatic merge 2012-03-28 13:58:14 +03:00
ha_partition.h Automatic merge 2012-03-28 13:58:14 +03:00
handler.cc Changed names of statistic variables and counting matches instaed of rejected rows. 2012-02-22 10:38:28 +02:00
handler.h Automatic merge 2012-03-28 13:58:14 +03: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. 2012-04-06 16:40:39 -07:00
item.h Fixed bug #915222. 2012-04-06 15:08:09 -07:00
item_buff.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
item_cmpfunc.cc BUG#951937: Wrong result (missing rows) with semijoin+materialization, IN subquery, InnoDB, TEMPTABLE view 2012-03-26 13:47:00 +04:00
item_cmpfunc.h BUG#951937: Wrong result (missing rows) with semijoin+materialization, IN subquery, InnoDB, TEMPTABLE view 2012-03-26 13:47:00 +04:00
item_create.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
item_create.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
item_func.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
item_func.h BUG#906357: Incorrect result with outer join and full text match 2011-12-20 00:55:32 +04:00
item_geofunc.cc Merge with 5.1 & fixes to IGNORE handling 2011-12-11 19:28:05 +02:00
item_geofunc.h Fix for bug #809849 spatial operations must be KILL-able. 2011-11-20 12:30:43 +04:00
item_row.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
item_row.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
item_strfunc.cc Updated/added copyright headers 2012-02-15 17:13:47 +01:00
item_strfunc.h Fix for LP BUG#944504 2012-03-05 15:48:12 +02:00
item_subselect.cc BUG#978479: Wrong result (extra rows) with derived_with_keys+loosescan+semijoin=ON, materialization=OFF 2012-04-19 04:50:32 +04:00
item_subselect.h merge 2012-04-05 23:07:18 +02:00
item_sum.cc Updated/added copyright headers 2012-02-15 17:13:47 +01:00
item_sum.h Rolled back the patch for bug 791761. 2012-02-26 00:19:07 -08:00
item_timefunc.cc merge 2012-04-05 23:07:18 +02:00
item_timefunc.h lp:923429 Crash in decimal_cmp on using UNIX_TIMESTAMP with a wrongly formatted timestamp 2012-02-21 21:18:41 +01:00
item_xmlfunc.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
item_xmlfunc.h
key.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
lex.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
lex_symbol.h
lock.cc Fixed lp:963603 "Assertion `lock_type != TL_UNLOCK && (lock_type == TL_IGNORE || file->lock.type == TL_UNLOCK)' failed in ha_maria::store_lock with DML, triggers, views" 2012-03-26 13:29:45 +03:00
log.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
log.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
log_event.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
log_event.h Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" 2012-03-13 16:38:43 +02:00
log_event_old.cc Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" 2012-03-13 16:38:43 +02:00
log_event_old.h Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" 2012-03-13 16:38:43 +02:00
log_slow.h
Makefile.am merge 2012-04-05 23:07:18 +02:00
message.h Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
message.mc
message.rc
mf_iocache.cc Fix a bunch of Windows warnings 2010-04-21 02:25:59 +02:00
MSG00001.bin
multi_range_read.cc Added back MRR counters. The new names are: Handler_mrr_init, 2012-02-22 16:48:29 +04:00
multi_range_read.h Make EXPLAIN better at displaying MRR/BKA: 2011-04-02 14:04:45 +04:00
my_decimal.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
my_decimal.h merge 2012-04-05 23:07:18 +02:00
my_lock.c
mysql_install_db.cc MDEV-221 - Properly escape command line when starting mysql_install_db 2012-04-16 15:28:33 +02:00
mysql_priv.h Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_open_tables_state. 2012-02-23 16:43:35 +02:00
mysql_upgrade_service.cc - Properly terminate options array with all-zero entry. 2011-05-20 01:38:42 +02:00
mysqld.cc Don't disable core on signal just becasue platform doesn't handle stack traces 2012-04-03 15:42:26 +03:00
mysqld_suffix.h
net_serv.cc Updated/added copyright headers 2011-06-30 17:31:31 +02:00
nt_servc.cc
nt_servc.h
opt_index_cond_pushdown.cc Backport of: 2012-02-16 20:15:57 +04:00
opt_range.cc Fixed LP bug #954262. 2012-03-20 17:03:28 -07:00
opt_range.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
opt_range_mrr.cc Fixed compiler warnings 2011-02-25 20:15:27 +02:00
opt_subselect.cc BUG#913030: Optimizer chooses a suboptimal excution plan for Q18 from DBT-3 2012-04-02 21:41:54 +04:00
opt_subselect.h BUG#978479: Wrong result (extra rows) with derived_with_keys+loosescan+semijoin=ON, materialization=OFF 2012-04-19 05:37:16 +04:00
opt_sum.cc Merge 5.2->5.3 2012-03-14 13:58:18 +02:00
opt_table_elimination.cc 5.2->5.3 merge 2011-11-12 18:08:12 +01:00
parse_file.cc LPBUG#983285 - incompatibility in frm in case of VIEWs with non-default ALGORITHM option. 2012-04-20 21:09:16 +02:00
parse_file.h LPBUG#983285 - incompatibility in frm in case of VIEWs with non-default ALGORITHM option. 2012-04-20 21:09:16 +02:00
partition_element.h Merge with main 2011-02-22 20:28:01 +02:00
partition_info.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
partition_info.h Updated/added copyright headers 2011-06-30 17:37:13 +02:00
password.c merge 2012-04-05 12:01:52 +02:00
plistsort.c Precise GIS functions added. 2011-05-04 23:20:17 +05:00
procedure.cc
procedure.h Subquery cache (MWL#66) added. 2010-07-10 13:37:30 +03:00
protocol.cc merge 2012-04-05 23:07:18 +02:00
protocol.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
records.cc Speedup: 2012-03-23 18:22:39 +02:00
repl_failsafe.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
repl_failsafe.h
rpl_constants.h Updated/added copyright headers 2011-06-30 17:37:13 +02:00
rpl_filter.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
rpl_filter.h
rpl_injector.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
rpl_injector.h
rpl_mi.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
rpl_mi.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
rpl_record.cc Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" 2012-03-13 16:38:43 +02:00
rpl_record.h Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" 2012-03-13 16:38:43 +02:00
rpl_record_old.cc Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" 2012-03-13 16:38:43 +02:00
rpl_record_old.h Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" 2012-03-13 16:38:43 +02:00
rpl_reporting.cc Updated/added copyright headers 2011-06-30 17:37:13 +02:00
rpl_reporting.h Updated/added copyright headers 2011-06-30 17:37:13 +02:00
rpl_rli.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
rpl_rli.h merge 2012-04-05 23:07:18 +02:00
rpl_tblmap.cc Updated/added copyright headers 2011-06-30 17:37:13 +02:00
rpl_tblmap.h
rpl_utility.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
rpl_utility.h Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
scheduler.cc Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. 2012-02-01 15:48:02 -08:00
scheduler.h
set_var.cc Fix trivial merge error 2011-12-15 16:43:28 +04:00
set_var.h Updated/added copyright headers 2011-06-30 17:31:31 +02:00
signal_handler.cc merge 2012-03-21 19:15:29 +01:00
slave.cc When we fail during slave thread initialisation, keep mi->run_lock 2012-02-13 17:14:10 +01:00
slave.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
sp.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sp.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sp_cache.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sp_cache.h
sp_head.cc merge 2012-04-05 23:07:18 +02:00
sp_head.h merge 2012-04-05 12:01:52 +02:00
sp_pcontext.cc Updated/added copyright headers 2011-06-30 17:37:13 +02:00
sp_pcontext.h Updated/added copyright headers 2011-06-30 17:37:13 +02:00
sp_rcontext.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sp_rcontext.h Merge Mariadb 5.1->5.2 2011-04-12 14:26:06 +02:00
spatial.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
spatial.h Merge with 5.1 & fixes to IGNORE handling 2011-12-11 19:28:05 +02:00
sql_acl.cc merge 2012-04-02 17:54:33 +02:00
sql_acl.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sql_analyse.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02: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 Backport of subquery optimizations to 5.3. 2010-01-17 17:51:10 +03:00
sql_base.cc LP BUG#978847 fixed. 2012-04-19 09:16:30 +03:00
sql_binlog.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_bitmap.h Merged the code of MWL#106 into 5.3 2011-05-16 22:39:43 -07:00
sql_builtin.cc.in Maria WL#61 2010-04-01 17:34:51 +03:00
sql_cache.cc merge 2012-04-05 23:07:18 +02:00
sql_cache.h Fixed typos in Query Cache. 2012-02-03 16:56:12 +02:00
sql_class.cc merge 2012-04-05 23:07:18 +02:00
sql_class.h Fixed LP bug #939009. 2012-02-24 16:50:22 -08:00
sql_client.cc
sql_connect.cc merge 2012-04-05 23:07:18 +02:00
sql_crypt.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sql_crypt.h Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sql_cursor.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_cursor.h
sql_db.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_delete.cc Speedup: 2012-03-23 18:22:39 +02:00
sql_derived.cc Fixed LP bug #953649. 2012-03-13 13:34:20 -07:00
sql_do.cc
sql_error.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_error.h
sql_expression_cache.cc Early check of subquery cache hit rate added to limit its performance impact in the worst case. 2011-08-12 13:54:41 +03:00
sql_expression_cache.h Early check of subquery cache hit rate added to limit its performance impact in the worst case. 2011-08-12 13:54:41 +03:00
sql_handler.cc Speedup: 2012-03-23 18:22:39 +02:00
sql_handler.h Implementation of MWL#172: Add support for prepared statements to HANDLER READ 2011-01-04 00:55:41 +02:00
sql_help.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_insert.cc Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view. 2012-02-03 13:01:05 +02:00
sql_join_cache.cc Speedup: 2012-03-23 18:22:39 +02:00
sql_join_cache.h Counters for Index Condition Pushdown added (MDEV-130). 2012-02-16 08:49:10 +02:00
sql_lex.cc Fix for LP BUG#910123 MariaDB 5.3.3 causes 1093 error on Drupal 2012-02-14 16:52:56 +02:00
sql_lex.h Rewrite IGNORE handling: 2011-12-11 18:39:33 +02:00
sql_lifo_buffer.h Fixed high-impact Windows 64bit warnings (at least 4000 of them) 2011-02-19 13:43:01 +01:00
sql_list.cc
sql_list.h Unused method removed. 2012-04-06 13:18:12 +03:00
sql_load.cc Updated/added copyright headers 2012-02-15 17:13:47 +01:00
sql_locale.cc Updated/added copyright headers 2011-06-30 17:37:13 +02:00
sql_manager.cc Fix embedded/windows tests- move COND_manager and LOCK_manager to sql_manager.cc, to prevent race condition that results into accessing already destroyed critical section 2012-01-02 23:52:31 +01:00
sql_map.cc
sql_map.h
sql_olap.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_parse.cc Merge fix for lp:910817: Race condition in kill_threads_for_user(). 2012-02-10 21:20:32 +01:00
sql_partition.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sql_partition.h Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sql_plugin.cc Fixed lp:886479 "[PATCH] plugin boolean result" 2012-04-02 11:45:07 +03:00
sql_plugin.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sql_plugin_services.h Added progress reporting for alter table, LOAD DATA INFILE and for aria tables: check table, repair table, analyze table. 2011-07-01 15:08:30 +03:00
sql_prepare.cc Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view. 2012-02-03 13:01:05 +02:00
sql_profile.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_profile.h Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sql_rename.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_repl.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_repl.h
sql_select.cc Fixed LP bug #972943 properly. 2012-04-07 17:27:00 -07:00
sql_select.h Fixes lp:941889 "JOIN constructors takes a long time in 5.3" 2012-03-23 18:18:16 +02:00
sql_servers.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sql_servers.h
sql_show.cc merge 2012-04-05 23:07:18 +02:00
sql_show.h Updated/added copyright headers 2011-06-30 17:37:13 +02:00
sql_sort.h An implementation of index intersect via a modified Unique class. 2010-09-13 15:22:11 -07:00
sql_state.c
sql_string.cc Updated/added copyright headers 2012-02-15 17:13:47 +01:00
sql_string.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_table.cc Speedup: 2012-03-23 18:22:39 +02:00
sql_tablespace.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sql_test.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_trigger.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_trigger.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_udf.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sql_udf.h
sql_union.cc Fixed LP bug #939009. 2012-02-24 16:50:22 -08:00
sql_update.cc Speedup: 2012-03-23 18:22:39 +02:00
sql_view.cc LPBUG#983285 - incompatibility in frm in case of VIEWs with non-default ALGORITHM option. 2012-04-20 21:09:16 +02:00
sql_view.h Updated/added copyright headers 2011-06-30 17:37:13 +02:00
sql_yacc.yy merge 2012-04-05 23:07:18 +02:00
strfunc.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
structs.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
table.cc LP BUG#978847 fixed. 2012-04-19 09:16:30 +03:00
table.h LPBUG#983285 - incompatibility in frm in case of VIEWs with non-default ALGORITHM option. 2012-04-20 21:09:16 +02:00
thr_malloc.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
time.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
tzfile.h
tztime.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
tztime.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
udf_example.c Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
udf_example.def Patch set contributed by Alex Budovski (MCA) 2010-01-29 20:42:22 +02:00
uniques.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
unireg.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
unireg.h merge 2012-04-05 23:07:18 +02:00
winservice.c LP952607: Do not show MySQL services preinstalled by Dell in the upgrade wizard 2012-03-12 12:14:04 +01:00
winservice.h split long lines, use get_mysql_service_properties() 2011-01-30 22:42:02 +01:00