Commit 170bec36 authored by Vicențiu Ciorbaru's avatar Vicențiu Ciorbaru

Merge branch '5.5' into 10.0

parents 6b8d34fe ca733d03
...@@ -8770,6 +8770,7 @@ void init_re(void) ...@@ -8770,6 +8770,7 @@ void init_re(void)
"[[:space:]]*SELECT[[:space:]]|" "[[:space:]]*SELECT[[:space:]]|"
"[[:space:]]*CREATE[[:space:]]+TABLE[[:space:]]|" "[[:space:]]*CREATE[[:space:]]+TABLE[[:space:]]|"
"[[:space:]]*DO[[:space:]]|" "[[:space:]]*DO[[:space:]]|"
"[[:space:]]*HANDLER[[:space:]]+.*[[:space:]]+READ[[:space:]]|"
"[[:space:]]*SET[[:space:]]+OPTION[[:space:]]|" "[[:space:]]*SET[[:space:]]+OPTION[[:space:]]|"
"[[:space:]]*DELETE[[:space:]]+MULTI[[:space:]]|" "[[:space:]]*DELETE[[:space:]]+MULTI[[:space:]]|"
"[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|" "[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|"
......
...@@ -1405,7 +1405,7 @@ USE test; ...@@ -1405,7 +1405,7 @@ USE test;
End of 5.0 tests. End of 5.0 tests.
select * from information_schema.engines WHERE ENGINE="MyISAM"; select * from information_schema.engines WHERE ENGINE="MyISAM";
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
MyISAM DEFAULT MyISAM storage engine NO NO NO MyISAM DEFAULT Non-transactional engine with good performance and small data footprint NO NO NO
grant select on *.* to user3148@localhost; grant select on *.* to user3148@localhost;
select user,db from information_schema.processlist; select user,db from information_schema.processlist;
user db user db
......
...@@ -407,7 +407,7 @@ LOCK TABLE t1 WRITE; ...@@ -407,7 +407,7 @@ LOCK TABLE t1 WRITE;
HANDLER t1 OPEN; HANDLER t1 OPEN;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
HANDLER t1 READ FIRST; HANDLER t1 READ FIRST;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction Got one of the listed errors
HANDLER t1 CLOSE; HANDLER t1 CLOSE;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
UNLOCK TABLES; UNLOCK TABLES;
......
if (!`SELECT count(*) FROM information_schema.plugins WHERE if (!`SELECT count(*) FROM information_schema.plugins WHERE
plugin_name = 'federated' AND plugin_status = 'active' AND plugin_name = 'federated' AND plugin_status = 'active' AND
plugin_description LIKE '%FederatedX%'`){ plugin_description LIKE '%transactions%'`){
skip Need FederatedX engine; skip Need FederatedX engine;
} }
...@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines ...@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'ARCHIVE'; WHERE ENGINE = 'ARCHIVE';
ENGINE ARCHIVE ENGINE ARCHIVE
SUPPORT YES SUPPORT YES
COMMENT Archive storage engine COMMENT gzip-compresses tables for a low storage footprint
TRANSACTIONS NO TRANSACTIONS NO
XA NO XA NO
SAVEPOINTS NO SAVEPOINTS NO
...@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines ...@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'CSV'; WHERE ENGINE = 'CSV';
ENGINE CSV ENGINE CSV
SUPPORT YES SUPPORT YES
COMMENT CSV storage engine COMMENT Stores tables as CSV files
TRANSACTIONS NO TRANSACTIONS NO
XA NO XA NO
SAVEPOINTS NO SAVEPOINTS NO
...@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines ...@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'FEDERATED'; WHERE ENGINE = 'FEDERATED';
ENGINE FEDERATED ENGINE FEDERATED
SUPPORT YES SUPPORT YES
COMMENT FederatedX pluggable storage engine COMMENT Allows to access tables on other MariaDB servers, supports transactions and more
TRANSACTIONS YES TRANSACTIONS YES
XA NO XA NO
SAVEPOINTS YES SAVEPOINTS YES
...@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines ...@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'MyISAM'; WHERE ENGINE = 'MyISAM';
ENGINE MyISAM ENGINE MyISAM
SUPPORT DEFAULT SUPPORT DEFAULT
COMMENT MyISAM storage engine COMMENT Non-transactional engine with good performance and small data footprint
TRANSACTIONS NO TRANSACTIONS NO
XA NO XA NO
SAVEPOINTS NO SAVEPOINTS NO
...@@ -377,7 +377,9 @@ send optimize table t1; ...@@ -377,7 +377,9 @@ send optimize table t1;
# client 1 # client 1
--echo proceed with the normal connection --echo proceed with the normal connection
connection default; connection default;
--disable_ps_protocol
handler t1 read next; handler t1 read next;
--enable_ps_protocol
handler t1 close; handler t1 close;
# client 2 # client 2
--echo read the result from the other connection --echo read the result from the other connection
......
...@@ -269,7 +269,7 @@ handler t1 open; ...@@ -269,7 +269,7 @@ handler t1 open;
lock table t1 write; lock table t1 write;
alter table t1 engine=csv; alter table t1 engine=csv;
handler t1 read a next; handler t1 read a next;
ERROR HY000: Storage engine CSV of the table `test`.`t1` doesn't have this option Got one of the listed errors
handler t1 close; handler t1 close;
unlock tables; unlock tables;
drop table t1; drop table t1;
......
...@@ -326,7 +326,7 @@ let $wait_condition= ...@@ -326,7 +326,7 @@ let $wait_condition=
info = "alter table t1 engine=csv"; info = "alter table t1 engine=csv";
--source include/wait_condition.inc --source include/wait_condition.inc
connection default; connection default;
--error ER_ILLEGAL_HA --error ER_ILLEGAL_HA,ER_KEY_DOES_NOT_EXITS
handler t1 read a next; handler t1 read a next;
handler t1 close; handler t1 close;
connection con1; connection con1;
......
create table t1 (i int);
handler test.t1 open handler_a;
flush status;
handler handler_a read first;
i
show status like 'Com_stmt_prepare%';
Variable_name Value
Com_stmt_prepare OK
drop table t1;
#
# MDEV-15729 Server crashes in Field::make_field upon HANDLER READ executed with PS protocol
#
create table t1 (i int);
handler test.t1 open handler_a;
flush status;
handler handler_a read first;
# handler...read must be prepared in --ps-protocol mode
--replace_result $PS_PROTOCOL OK
show status like 'Com_stmt_prepare%';
drop table t1;
...@@ -481,7 +481,7 @@ LOCK TABLE t1 WRITE; ...@@ -481,7 +481,7 @@ LOCK TABLE t1 WRITE;
--echo # HANDLER commands are not allowed in LOCK TABLES mode --echo # HANDLER commands are not allowed in LOCK TABLES mode
--error ER_LOCK_OR_ACTIVE_TRANSACTION --error ER_LOCK_OR_ACTIVE_TRANSACTION
HANDLER t1 OPEN; HANDLER t1 OPEN;
--error ER_LOCK_OR_ACTIVE_TRANSACTION --error ER_LOCK_OR_ACTIVE_TRANSACTION,ER_UNKNOWN_TABLE
HANDLER t1 READ FIRST; HANDLER t1 READ FIRST;
--error ER_LOCK_OR_ACTIVE_TRANSACTION --error ER_LOCK_OR_ACTIVE_TRANSACTION
HANDLER t1 CLOSE; HANDLER t1 CLOSE;
......
...@@ -986,6 +986,7 @@ SQL_HANDLER *mysql_ha_read_prepare(THD *thd, TABLE_LIST *tables, ...@@ -986,6 +986,7 @@ SQL_HANDLER *mysql_ha_read_prepare(THD *thd, TABLE_LIST *tables,
if (!(handler= mysql_ha_find_handler(thd, tables->alias))) if (!(handler= mysql_ha_find_handler(thd, tables->alias)))
DBUG_RETURN(0); DBUG_RETURN(0);
tables->table= handler->table; // This is used by fix_fields tables->table= handler->table; // This is used by fix_fields
handler->table->pos_in_table_list= tables;
if (mysql_ha_fix_cond_and_key(handler, mode, keyname, key_expr, cond, 1)) if (mysql_ha_fix_cond_and_key(handler, mode, keyname, key_expr, cond, 1))
DBUG_RETURN(0); DBUG_RETURN(0);
DBUG_RETURN(handler); DBUG_RETURN(handler);
......
...@@ -1890,7 +1890,7 @@ maria_declare_plugin(archive) ...@@ -1890,7 +1890,7 @@ maria_declare_plugin(archive)
&archive_storage_engine, &archive_storage_engine,
"ARCHIVE", "ARCHIVE",
"Brian Aker, MySQL AB", "Brian Aker, MySQL AB",
"Archive storage engine", "gzip-compresses tables for a low storage footprint",
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
archive_db_init, /* Plugin Init */ archive_db_init, /* Plugin Init */
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
......
...@@ -1760,7 +1760,7 @@ maria_declare_plugin(csv) ...@@ -1760,7 +1760,7 @@ maria_declare_plugin(csv)
&csv_storage_engine, &csv_storage_engine,
"CSV", "CSV",
"Brian Aker, MySQL AB", "Brian Aker, MySQL AB",
"CSV storage engine", "Stores tables as CSV files",
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tina_init_func, /* Plugin Init */ tina_init_func, /* Plugin Init */
tina_done_func, /* Plugin Deinit */ tina_done_func, /* Plugin Deinit */
......
...@@ -3474,7 +3474,7 @@ maria_declare_plugin(federated) ...@@ -3474,7 +3474,7 @@ maria_declare_plugin(federated)
&federated_storage_engine, &federated_storage_engine,
"FEDERATED", "FEDERATED",
"Patrick Galbraith and Brian Aker, MySQL AB", "Patrick Galbraith and Brian Aker, MySQL AB",
"Federated MySQL storage engine", "Allows to access tables on other MariaDB servers",
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
federated_db_init, /* Plugin Init */ federated_db_init, /* Plugin Init */
federated_done, /* Plugin Deinit */ federated_done, /* Plugin Deinit */
......
...@@ -3645,7 +3645,7 @@ maria_declare_plugin(federatedx) ...@@ -3645,7 +3645,7 @@ maria_declare_plugin(federatedx)
&federatedx_storage_engine, &federatedx_storage_engine,
"FEDERATED", "FEDERATED",
"Patrick Galbraith", "Patrick Galbraith",
"FederatedX pluggable storage engine", "Allows to access tables on other MariaDB servers, supports transactions and more",
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
federatedx_db_init, /* Plugin Init */ federatedx_db_init, /* Plugin Init */
federatedx_done, /* Plugin Deinit */ federatedx_done, /* Plugin Deinit */
......
...@@ -2450,7 +2450,7 @@ maria_declare_plugin(myisam) ...@@ -2450,7 +2450,7 @@ maria_declare_plugin(myisam)
&myisam_storage_engine, &myisam_storage_engine,
"MyISAM", "MyISAM",
"MySQL AB", "MySQL AB",
"MyISAM storage engine", "Non-transactional engine with good performance and small data footprint",
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
myisam_init, /* Plugin Init */ myisam_init, /* Plugin Init */
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment