September 2015 - developers - lists.mariadb.org

[Maria-developers] MDEV-8109 unexpected CAST result
by Alexander Barkov 11 Nov '15

11 Nov '15

Hi Serg, Please review my patch for MDEV-8109. Thanks!

2 1

[Maria-developers] crosscompiling in buildroot: cannot find -laio and other link error
by Sylvain Raybaud 23 Oct '15

23 Oct '15

Hi I'm trying to get the latest version of mariadb-galera (10.0.21) into buildroot. I'm running into two errors which I have a feeling are related. But I may be wrong. These problems arise during the build of the host variant of the package. I get the two following errors (build does not stop at the first one because they happen in parallel jobs): 1: Linking CXX shared module ha_connect.so /home/sylvain/git/br/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libxml2.so: error adding symbols: File in wrong format --> for host variant ha_connect.so should be linked against /home/sylvain/git/br/output/host/usr/lib/libxml2.so 2: Linking CXX shared module ha_innodb.so /usr/bin/ld: cannot find -laio The thing is, libaio and libxml2 are both present in /home/sylvain/git/br/output/host/usr/lib/. The link command present in storage/connect/CMakeFiles/connect.dir/link.txt (http://pastebin.com/Qn1ZCw2X) contains: /home/sylvain/git/br/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libxml2.so which is incorrect, should be: /home/sylvain/git/br/output/host/usr/lib/libxml2.so The link command present in storage/innobase/CMakeFiles/innobase.dir/link.txt (http://pastebin.com/it6W9WVs) does not contain -L/home/sylvain/git/br/output/host/usr/lib/. I think it should. At least, when I manually run this command adding -L/home/sylvain/git/br/output/host/usr/lib, it works. I'm really not sure how these link.txt are generated. I checked connect/CMakeLists.txt and innobase/CMakeLists.txt and could not find anything obvious problem. Beside, toplevel CMakeCache.txt does contain: CMAKE_EXE_LINKER_FLAGS:STRING=-L/home/sylvain/git/br/output/host/lib -L/home/sylvain/git/br/output/host/usr/lib -Wl,-rpath,/home/sylvain/git/br/output/host/usr/lib which seems correct. I don't know why this setting does not reach storage/innobase and I'm also not sure why ha_connect.so tries to link against target variant of libxml2. It basically comes down to have cmake look for shared libraries in the right place, but I don't seem to be able to determine which lever to pull. Any hint as to how to achieve that is therefore welcome. Cheers, -- Sylvain Raybaud www.green-communications.fr

2 7

Re: [Maria-developers] [Commits] ee656a4: MDEV-7846: postreview fix
by Sergei Golubchik 06 Oct '15

06 Oct '15

Hi, Sanja! I have no idea how this postreview fix relates to any of my review comments. Let me repeat them again: 1. Add comments 2. Add a test case with row items 3. In your test case - if you remove GROUP BY you get a crash again. This might be a different bug, though. On Aug 05, sanja(a)mariadb.com wrote: > revision-id: ee656a4aabb5ebbe973b7e4c99be83eb5dc8c0ce > parent(s): 9f8a458fb2d07298810bb5d9824ce728017bfb32 > committer: Oleksandr Byelkin > branch nick: server > timestamp: 2015-08-05 11:57:35 +0200 > message: > > MDEV-7846: postreview fix > > diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc > index 29fff8e..e96d1bc 100644 > --- a/sql/item_cmpfunc.cc > +++ b/sql/item_cmpfunc.cc > @@ -1455,12 +1455,13 @@ bool Item_in_optimizer::fix_left(THD *thd, Item **ref) > next execution we need to copy args[1]->left_expr again. > */ > ref0= &(((Item_in_subselect *)args[1])->left_expr); > + args[0]= ((Item_in_subselect *)args[1])->left_expr; > } > if ((!(*ref0)->fixed && (*ref0)->fix_fields(thd, ref0)) || > (!cache && !(cache= Item_cache::get_cache(*ref0)))) > DBUG_RETURN(1); > if (args[0] != (*ref0)) > - current_thd->change_item_tree(args, (*ref0)); > + args[0]= (*ref0); > DBUG_PRINT("info", ("actual fix fields")); Regards, Sergei

2 1

[Maria-developers] MariaDB Developer Meeting in Amsterdam Oct 13-15
by Rasmus Johansson 02 Oct '15

02 Oct '15

Hi maria-developers, There will be a MariaDB Developer Meeting taking place in Amsterdam on October 13-15. It would be great to see many of you there. The main focus of the event is as the title implies the development aspect of MariaDB, but also aspects like documentation, infrastructure and other community related topics will have their place in the event. Also MaxScale developers will be present. If you are interested please sign up by joining and rsvping the event's meetup page here: http://www.meetup.com/MariaDB-Developers/events/224068714/ The session backlog and the schedule for the three days are found here: https://docs.google.com/a/skysql.com/spreadsheets/d/17J_Jloc8I33nsEIE1KCZct… You'll notice that the schedule is not fixed and the idea is the following: - Everyone attending the meeting can affect the agenda by adding sessions to the session backlog - Everyone attending can/should vote on the session of interest in the backlog by raising the count in the Votes column Please feel free to suggest new sessions and remember to vote on the ones you think are most interesting (no limitation on how many you vote for). Best regards, Rasmus -- Rasmus Johansson, VP Engineering MariaDB | t: +358 50 499 9589 | Skype: ratzpo

2 2

[Maria-developers] Groups in PAM plugin.
by Alexey Botchkov 28 Sep '15

28 Sep '15

Hi. I came up with a small program that checks if an Unix user belongs to a group 'wheel'. That can be attached to the 'plugin/auth_pam/mapper/pam_user_map.c' in no time if that's what we want. http://myoffice.izhnet.ru/~af/gr.cc An it must be LDAP-compliant AFAIK. Best regards. HF

1 0

[Maria-developers] New Programmer(Maria-DB)
by indiavaibhav vaibhavindia 28 Sep '15

28 Sep '15

Hello everyone, My name is Vaibhav Choudhary.I am in my second year undergraduation and am new to open source. I would like to contribute to your project.Can anyone please guide me as to how should i work on a patch after i have identified the problem on JIRA? I have a good knowledge of C++ and am studying MySQL.But I am unable to figure out as to how should I go about writing the code for the issues on JIRA. Thanks Vaibhav

2 4

Re: [Maria-developers] [Commits] 1d92131: MDEV-4829 BEFORE INSERT triggers dont issue 1406 error.
by Sergei Golubchik 27 Sep '15

27 Sep '15

Hi, Holyfoot! On Sep 24, holyfoot(a)askmonty.org wrote: > revision-id: 1d92131613770b505fa462b33c1091e00d9475be (mariadb-10.1.7-61-g1d92131) > parent(s): e5418942609833edb681d16c4e2705f8c338bfee > committer: Alexey Botchkov > timestamp: 2015-09-24 14:31:06 +0500 > message: > > MDEV-4829 BEFORE INSERT triggers dont issue 1406 error. > Fixed as it's done in MySQL 5.7. > The Strict_error_handler introduced to intercept such states and is activated > in the sp_head::execute_trigger() Hmm... This is, basically, a new implementation of the strict mode. But enabled only for triggers, which is kind of weird. And potentially very fragile and inconsistent, as it's a strict mode we're talking about, it's confusing and not very consistent on itself. Having two different implementations of it doesn't help to make it clear or consistent. If you're introducing a new implementation - use it consistently everywhere. If that won't change existing intentional behavior. And please talk to Bar about his recent experiences in this area. There were also few comments about the code, see below. > diff --git a/sql/sp_head.cc b/sql/sp_head.cc > index a117963..ff6d2b4 100644 > --- a/sql/sp_head.cc > +++ b/sql/sp_head.cc > @@ -54,6 +54,35 @@ > > #include <my_user.h> > > +/** > + A simple RAII wrapper around Strict_error_handler. > +*/ > +class Strict_error_handler_wrapper > +{ > + THD *m_thd; > + Strict_error_handler m_strict_handler; > + bool m_active; > + > +public: > + Strict_error_handler_wrapper(THD *thd, sp_head *sp_head) > + : m_thd(thd), m_active(false) > + { > + if (sp_head->m_sql_mode & (MODE_STRICT_ALL_TABLES | > + MODE_STRICT_TRANS_TABLES)) > + { > + m_thd->push_internal_handler(&m_strict_handler); > + m_active= true; > + } > + } > + > + ~Strict_error_handler_wrapper() > + { > + if (m_active) > + m_thd->pop_internal_handler(); > + } > +}; Oh, really? A wrapper per handler? Make it a template, please, so that it could be used for any error handler. Like this: Error_handler_wraper<Strict_error_handler> strict_error_handler(thd, this); Also, it would be good if you do a second commit using this wrapper in other places, where appropriate. > @@ -1576,6 +1605,9 @@ sp_head::execute_trigger(THD *thd, > DBUG_ENTER("sp_head::execute_trigger"); > DBUG_PRINT("info", ("trigger %s", m_name.str)); > > + // Push Strict_error_handler if the SP was created in STRICT mode. > + Strict_error_handler_wrapper strict_wrapper(thd, this); > + > #ifndef NO_EMBEDDED_ACCESS_CHECKS > Security_context *save_ctx= NULL; > > diff --git a/sql/sql_base.cc b/sql/sql_base.cc > index 9162969..ca0699c 100644 > --- a/sql/sql_base.cc > +++ b/sql/sql_base.cc > @@ -96,6 +96,74 @@ bool No_such_table_error_handler::safely_trapped_errors() > > > /** > + Implementation of STRICT mode. > + Upgrades a set of given conditions from warning to error. > +*/ > +bool Strict_error_handler::handle_condition_ext(THD *thd, > + uint sql_errno, > + const char *sqlstate, > + Sql_condition::enum_warning_level *level, > + const char *msg, > + Sql_condition **cond_hdl) > +{ > + /* STRICT MODE should affect only the below statements */ Really? > + switch (thd->lex->sql_command) > + { > + case SQLCOM_CREATE_TABLE: > + case SQLCOM_DROP_INDEX: > + case SQLCOM_INSERT: > + case SQLCOM_REPLACE: > + case SQLCOM_REPLACE_SELECT: > + case SQLCOM_INSERT_SELECT: > + case SQLCOM_UPDATE: > + case SQLCOM_UPDATE_MULTI: > + case SQLCOM_DELETE: > + case SQLCOM_DELETE_MULTI: > + case SQLCOM_ALTER_TABLE: > + case SQLCOM_LOAD: > + case SQLCOM_CALL: > + case SQLCOM_END: > + case SQLCOM_SET_OPTION: > + case SQLCOM_SELECT: > + break; > + default: > + return false; > + } > + > + switch (sql_errno) > + { > + case ER_TRUNCATED_WRONG_VALUE: > + case ER_WRONG_VALUE_FOR_TYPE: > + case ER_WARN_DATA_OUT_OF_RANGE: > + case ER_DIVISION_BY_ZERO: > + case ER_TRUNCATED_WRONG_VALUE_FOR_FIELD: > + case WARN_DATA_TRUNCATED: > + case ER_DATA_TOO_LONG: > + case ER_BAD_NULL_ERROR: > + case ER_NO_DEFAULT_FOR_FIELD: > + case ER_TOO_LONG_KEY: > + case ER_WRONG_ARGUMENTS: > + case ER_NO_DEFAULT_FOR_VIEW_FIELD: > + case ER_WARN_NULL_TO_NOTNULL: > + case ER_CUT_VALUE_GROUP_CONCAT: > + case ER_DATETIME_FUNCTION_OVERFLOW: > + case ER_WARN_TOO_FEW_RECORDS: > + if ((*level == Sql_condition::WARN_LEVEL_WARN) && > + thd->transaction.stmt.m_unsafe_rollback_flags == 0 || > + (thd->variables.sql_mode & MODE_STRICT_ALL_TABLES)) > + { > + (*level)= Sql_condition::WARN_LEVEL_ERROR; > + thd->killed= KILL_BAD_DATA; > + } > + break; > + default: > + break; > + } > + return false; > +} > + > + > +/** > This internal handler is used to trap ER_NO_SUCH_TABLE and > ER_WRONG_MRG_TABLE errors during CHECK/REPAIR TABLE for MERGE > tables. > diff --git a/sql/sql_base.h b/sql/sql_base.h > index 1c0029d..c5a76c5 100644 > --- a/sql/sql_base.h > +++ b/sql/sql_base.h > @@ -676,5 +676,30 @@ class No_such_table_error_handler : public Internal_error_handler > int m_unhandled_errors; > }; > > +/** > + This internal handler implements upgrade from SL_WARNING to SL_ERROR "SL_ERROR"? "SL_WARNING"? > + for the error codes affected by STRICT mode. Currently STRICT mode does > + not affect SELECT statements. > +*/ > + > +class Strict_error_handler : public Internal_error_handler > +{ > +protected: > + bool handle_condition(THD *thd, > + uint sql_errno, > + const char* sqlstate, > + Sql_condition::enum_warning_level level, > + const char* msg, > + Sql_condition ** cond_hdl) > + { DBUG_ASSERT(FALSE); return 0; } > +public: > + bool handle_condition_ext(THD *thd, > + uint sql_errno, > + const char* sqlstate, > + Sql_condition::enum_warning_level *level, > + const char* msg, > + Sql_condition ** cond_hdl); 1. why not to change handle_condition() ? 2. strict mode may change the sql_errno, handle_condition_ext doesn't support it. > +}; > + > > #endif /* SQL_BASE_INCLUDED */ Regards, Sergei

1 2

Re: [Maria-developers] [Commits] d3f10e3: MDEV-8431 Feedback plugin needs an option for http proxy.
by Sergei Golubchik 26 Sep '15

26 Sep '15

Hi, Holyfoot! On Sep 21, holyfoot(a)askmonty.org wrote: > revision-id: d3f10e30ec39bccf1172c7b2eb159f40e412bdfd (mariadb-10.0.21-14-gd3f10e3) > parent(s): abd31ca2b6cde024772fcac0f4953219d76c6344 > committer: Alexey Botchkov > timestamp: 2015-09-21 14:06:15 +0500 > message: > > MDEV-8431 Feedback plugin needs an option for http proxy. > 'feedback_proxy_server' system variable added to specify the > proxy server. Not a dynamic one. How did you test this feature? > diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc > index f644bd5..f76c52a 100644 > --- a/plugin/feedback/feedback.cc > +++ b/plugin/feedback/feedback.cc > @@ -250,6 +251,9 @@ static int init(void *p) > > prepare_linux_info(); > > + proxy_url= proxy_server ? > + Url::create(proxy_server, strlen(proxy_server)) : 0; Some diagnostics would be nice here. At least "feedback: invalid proxy url: '%.*s'". See how ivalid feedback urls are reported. > + > url_count= 0; > if (*url) > { > @@ -347,6 +354,9 @@ static MYSQL_SYSVAR_ULONG(send_timeout, send_timeout, PLUGIN_VAR_RQCMDARG, > static MYSQL_SYSVAR_ULONG(send_retry_wait, send_retry_wait, PLUGIN_VAR_RQCMDARG, > "Wait this many seconds before retrying a failed send.", > NULL, NULL, 60, 1, 60*60*24, 1); > +static MYSQL_SYSVAR_STR(proxy_server, proxy_server, > + PLUGIN_VAR_READONLY | PLUGIN_VAR_RQCMDARG, > + "Proxy server address.", NULL, NULL,0); Mention that it must be an url. "Proxy server URL" or "Proxy server address, in the correct URI format", or something. > static struct st_mysql_sys_var* settings[] = { > MYSQL_SYSVAR(server_uid), > diff --git a/plugin/feedback/url_http.cc b/plugin/feedback/url_http.cc > index f214f7a..eade67c 100644 > --- a/plugin/feedback/url_http.cc > +++ b/plugin/feedback/url_http.cc > @@ -148,9 +148,12 @@ int Url_http::send(const char* data, size_t data_length) > my_socket fd= INVALID_SOCKET; > char buf[1024]; > uint len= 0; > + Url_http *proxy_loc= (Url_http *) proxy_url; > > addrinfo *addrs, *addr, filter= {0, AF_UNSPEC, SOCK_STREAM, 6, 0, 0, 0, 0}; > - int res= getaddrinfo(host.str, port.str, &filter, &addrs); > + int res= proxy_url ? > + getaddrinfo(proxy_loc->host.str, proxy_loc->port.str, &filter, &addrs) : > + getaddrinfo(host.str, port.str, &filter, &addrs); > First, you don't know whether proxy_url is Url_http. It might be easier to have an option --feedback-http-proxy=host:port (not the url). It also solves the potential future confusion if we'll have more than one transport. Second, I don't think proxies work this way at all, for a http proxy, you need to specify the host in th GET request, like POST http://foo.bar/bla/bla So, I think, a better implementation would be to take proxy into account not in Url_http::send(), but already in http_create(). And create Url_http objects for feedback url with proxy's host and port, and with the appropriately adjusted path. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] efcbbed: MDEV-8682 - CSV engine does not properly process "", in quotes
by Sergei Golubchik 26 Sep '15

26 Sep '15

Hi, Sergey! On Sep 22, Sergey Vojtovich wrote: > revision-id: efcbbed977dfcd9ee0ed035cbb0df4404483b0c8 (mariadb-10.1.7-53-gefcbbed) > parent(s): 7cbecadf9b59d06f4d9a9e776f99418b273c2ebc > committer: Sergey Vojtovich > timestamp: 2015-09-22 16:52:30 +0400 > message: > > MDEV-8682 - CSV engine does not properly process "", in quotes > > Added per-table boolean IETF_QUOTES variable to CSV storage engine. It allows to > enable IETF-compatible parsing of embedded quote and comma characters. Disabled > by default. > > This patch is based on Percona revision: > https://github.com/percona/percona-server/commit/b32fbf02766f8db00f9ff4e6dc… > > Note that original patch adds server variable, while this patch adds per-table > variable. I agree that a per-table option is safer. Ok to push. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 5f461a9: MDEV-7640: CHANGE MASTER TO doesn't work with prepared statements
by Kristian Nielsen 21 Sep '15

21 Sep '15

nirbhay(a)mariadb.com (Nirbhay Choubey) writes: > revision-id: 5f461a94a5aa2e1a20fa559ca612d96b53201e4e > parent(s): 29ac245dd04c5416d57a90b0ab3c4d08cbc4d723 > committer: Nirbhay Choubey > branch nick: 5.5 > timestamp: 2015-09-16 18:10:06 -0400 > message: > > MDEV-7640: CHANGE MASTER TO doesn't work with prepared statements > > When CHANGE MASTER was executed as a PS, its attributes were wrongly > getting reset toward the end of PREPARE. As a result, the subsequent > executions had no effect. Fixed by making sure that the CHANGE MASTER > attributes are preserved during the lifetime of the PS. Hm, this MDEV seems now assigned to me, but I did not see any mail from you about it? Did you expect a review? But in any case, this code around prepare/execute is not something I am familiar with. I seem to recall that Sanja worked on several issues related to incorrect prepare/execute, maybe he can have some ideas or suggest a reviewer. Apparently this is something that used to work but started to break sometimes in 5.5. Do you know how the problem was introduced? - Kristian (sadder by the hour over devs not using the mailing list).

2 1

[Maria-developers] Super Read Only in MariaDB (10.1) ?
by Jean-François Gagné 19 Sep '15

19 Sep '15

Hi, a super_read_only option is making its way in MySQL 5.7: * http://www.tocker.ca/2015/07/09/mysql-5-7-8-now-featuring-super_read_only-a… * http://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_… Are there plans to have a similar option in MariaDB (it would be great to have it in MariaDB 10.1) ? Many thanks, -- Jean-François Gagné System Engineer Booking.com BV Rembrandt Square Office Herengracht 597, 1017 CE Amsterdam

2 1

[Maria-developers] New programmer
by Acha Bill 18 Sep '15

18 Sep '15

Hello guys, I'm Acha Bill. Final year undergraduate in Computer Engineering. I would like to be an active contributor to your ongoing projects. I have good knowledge of C/C++ and MySQL. As this is my first approach to open source, any guidance will be much appreciated. Bill.

3 3

Re: [Maria-developers] Please review MDEV-8468 MDEV-8466
by Sergei Golubchik 17 Sep '15

17 Sep '15

Hi, Alexander! On Jul 21, Alexander Barkov wrote: > > I have one question about "HANDLER FOR SQLWARNING". > It does not catch messages of level "Note". > Looks like a bug. Please confirm, I'll file a report if so. Hmm, I don't know. According to the standard, SQLWARNING should match sqlstates in the category W, while SQLEXCEPTION should be for sqlstates in the category X. But we don't do that, 22007 is an exception (category X), but we treat it as a warning. So, the standard doesn't help to answer your question. We seem to use the logic where a level "error" means an SQL exception and a level "warning" means an SQL warning. Using this logic, "notes" are neither exceptions nor warnings, and neither SQLEXCEPTION nor SQLWARNING should match them. I'd say it's not a bug. The patch itself looks great, these changes in behavior are very welcomed. Just one small comment regarding THD::check_edom_and_truncation(), see below. > diff --git a/sql/sql_class.h b/sql/sql_class.h > index a8d8444..c19174b 100644 > --- a/sql/sql_class.h > +++ b/sql/sql_class.h > @@ -3270,6 +3270,53 @@ class THD :public Statement, > (!transaction.stmt.modified_non_trans_table || > (variables.sql_mode & MODE_STRICT_ALL_TABLES))); > } > + /** > + Check string-to-number conversion and produce a warning if > + - could not convert any digits (EDOM-alike error) > + - found garbage at the end of the string > + See also Field_num::check_edom_and_truncation() for a similar function. > + > + @param thd - the thread > + @param type - name of the data type (e.g. "INTEGER", "DECIMAL", "DOUBLE") > + @param edom - of a EDOM-alike error happened > + @param cs - character set of the original string > + @param str - the original string > + @param end_of_num - the position where the string-to-number routine stopped. > + @param end - the end of the string > + > + Unlike Field_num::check_edom_and_truncation(), this function does not > + distinguish between EDOM and truncation and reports the same warning for > + both cases. Perhaps we should eventually print different warnings, to make > + the explicit CAST work closer to the implicit cast in Field_xxx::store(). Why haven't you done it now? It causes too many changes in tests? > + */ > + void check_edom_and_truncation(const char *type, bool edom, > + CHARSET_INFO *cs, > + const char *str, > + const char *end_of_num, > + const char *end) Move this out of THD please. You don't need to call current_thd every time for it, but only when a warning should be issued. > + { > + DBUG_ASSERT(str <= end_of_num); > + DBUG_ASSERT(end_of_num <= end); > + if (edom || > + (end_of_num < end && !check_if_only_end_space(cs, end_of_num, end))) > + { > + /* > + We can use err.ptr() here as ErrConvString is guranteed to put an > + end \0 here. > + */ > + push_warning_printf(this, Sql_condition::WARN_LEVEL_WARN, > + ER_TRUNCATED_WRONG_VALUE, > + ER(ER_TRUNCATED_WRONG_VALUE), type, > + ErrConvString(str, end - str, cs).ptr()); > + } > + else if (end_of_num < end) > + { > + push_warning_printf(this, Sql_condition::WARN_LEVEL_NOTE, > + ER_TRUNCATED_WRONG_VALUE, > + ER(ER_TRUNCATED_WRONG_VALUE), type, > + ErrConvString(str, end - str, cs).ptr()); > + } > + } Regards, Sergei

2 1

[Maria-developers] unsubscribe
by Abdul Hakeem 16 Sep '15

16 Sep '15

1 0

Re: [Maria-developers] [Commits] a1f31cf: MDEV-6756: map a linux pid (child pid) to a connection id shown in the output of SHOW PROCESSLIST
by Sergei Golubchik 16 Sep '15

16 Sep '15

Hi, Sanja! Looks good, thanks. Ok to push! On Sep 15, sanja(a)mariadb.com wrote: > revision-id: a1f31cfa8d0f04cb166813786f7854db3dbcf715 (mariadb-10.1.6-12-ga1f31cf) > parent(s): 86a3613d4e981c341e38291c9eeec5dc9f836fae > committer: Oleksandr Byelkin > timestamp: 2015-09-15 21:50:28 +0200 > message: > > MDEV-6756: map a linux pid (child pid) to a connection id shown in the > output of SHOW PROCESSLIST > > Added tid (thread ID) for system where it is present. > > ps -eL -o tid,pid,command > > shows the thread on Linux Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 8bf23ef: MDEV-8208: Sporadic SEGFAULT on startup
by Sergei Golubchik 16 Sep '15

16 Sep '15

Hi, Nirbhay! On Aug 19, Nirbhay Choubey wrote: > revision-id: 8bf23efc914f18c687067e9314cadf4f36a85eec > parent(s): 71d1f35847a575239deff856590bf6f13afd74ed > committer: Nirbhay Choubey > branch nick: 5.5-galera.b8208 > timestamp: 2015-08-19 17:17:56 -0400 > message: > > MDEV-8208: Sporadic SEGFAULT on startup A couple of questions: > diff --git a/sql/mysqld.cc b/sql/mysqld.cc > index 2008fc5..4c05999 100644 > --- a/sql/mysqld.cc > +++ b/sql/mysqld.cc > @@ -4584,6 +4579,29 @@ static int init_server_components() > } > plugins_are_initialized= TRUE; /* Don't separate from init function */ > > +#ifdef WITH_WSREP > + /* Wait for wsrep threads to get created. */ > + if (wsrep_creating_startup_threads == 1) { > + mysql_mutex_lock(&LOCK_thread_count); > + while (wsrep_running_threads < 2) > + { > + mysql_cond_wait(&COND_thread_count, &LOCK_thread_count); > + } > + > + /* Now is the time to initialize threads for queries. */ > + THD *tmp; > + I_List_iterator<THD> it(threads); > + while ((tmp= it++)) > + if (tmp->wsrep_applier == true) > + tmp->init_for_queries(); Do you really need to iterate over all THD's? There is only one applier thread, right? And it's THD is not stored anywhere, only in the global list? > + mysql_mutex_unlock(&LOCK_thread_count); > + } > +#endif > + > have_csv= plugin_status(STRING_WITH_LEN("csv"), > MYSQL_STORAGE_ENGINE_PLUGIN); > have_ndbcluster= plugin_status(STRING_WITH_LEN("ndbcluster"), > @@ -4890,12 +4902,21 @@ pthread_handler_t start_wsrep_THD(void *arg) > //thd->version= refresh_version; > thd->proc_info= 0; > thd->command= COM_SLEEP; > - thd->set_time(); > - thd->init_for_queries(); > + > + if (plugins_are_initialized) > + { > + thd->init_for_queries(); > + } What happens if plugins are not initialized yet? thd->init_for_queries() will be done in that THD loop above? In that case why do you need to do it here? Regards, Sergei

2 2

Re: [Maria-developers] [Commits] 6ed7307: MDEV-8576: Bootstrap should ignore --enforce-storage-engine option
by Sergei Golubchik 16 Sep '15

16 Sep '15

Hi, Jan! On Sep 16, Jan Lindström wrote: > revision-id: 6ed73070e120e1be5456288556019db5bd3f9f60 > parent(s): 6cc1befcf26b2dc43e5cd7ad85d29c576073b1c5 > committer: Jan Lindström > branch nick: 10.1-tests > timestamp: 2015-09-16 11:47:34 +0300 > message: > > MDEV-8576: Bootstrap should ignore --enforce-storage-engine option > > Allow enforce-storage-engine="" option and use that on mysql_install_db > when doing bootstrap. Agree. After I commented on the previous patch it occurred to me that --disable-enforce-storage-engine is a bad idea, because --enable-enforce-storage-engine makes no sense, and one normally expects --enable-xxx for every --disable-xxx. So --enforce-storage-engine="" is a better way of switching this feature off. > diff --git a/sql/mysqld.cc b/sql/mysqld.cc > index b45d4e1..ee3b870 100644 > --- a/sql/mysqld.cc > +++ b/sql/mysqld.cc > @@ -4843,7 +4843,10 @@ static void add_file_to_crash_report(char *file) > static int init_default_storage_engine_impl(const char *opt_name, > char *engine_name, plugin_ref *res) > { > - if (!engine_name) > + /* Storage engine can be NULL and enforced storage engine > + can be empty. */ > + if (!engine_name || > + (strcmp(opt_name, "enforced_storage_engine") == 0 && strlen(engine_name) == 0)) > { > *res= 0; > return 0; In fact, default_tmp_storage_engine can be NULL too. See in mysqld.cc: if (default_tmp_storage_engine && !*default_tmp_storage_engine) default_tmp_storage_engine= NULL; if (init_default_storage_engine(default_tmp_storage_engine, tmp_table_plugin)) unireg_abort(1); And it looks like it's important to have default_tmp_storage_engine=NULL, not leave it as an empty string. Because Sys_var_plugin::do_check() doesn't allow empty strings as plugins names, but translates NULL to "no plugin". So, you either need to set enforced_storage_engine=NULL if it was an empty string, or you need to fix Sys_var_plugin::do_check() to treat empty strings as "no plugin" too. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 7f7cbb1: MDEV-6756: map a linux pid (child pid) to a connection id shown in the output of SHOW PROCESSLIST
by Sergei Golubchik 15 Sep '15

15 Sep '15

Hi, Sanja! There's an issue with cmake detection and with tests. But the code looks fine, thanks! On Sep 14, sanja(a)mariadb.com wrote: > revision-id: 7f7cbb132fa0a40687e4b25a9c9e163c93ec6d15 (mariadb-10.1.6-12-g7f7cbb1) > parent(s): 86a3613d4e981c341e38291c9eeec5dc9f836fae > committer: Oleksandr Byelkin > timestamp: 2015-09-14 12:47:57 +0200 > message: > > MDEV-6756: map a linux pid (child pid) to a connection id shown in the > output of SHOW PROCESSLIST > > Added tid (thread ID) for system where it is present. > > ps -eL -o tid,pid,command > > shows the thread on Linux > > diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result > index 2a918ad..ef889c7 100644 > --- a/mysql-test/r/information_schema.result > +++ b/mysql-test/r/information_schema.result > @@ -2066,3 +2066,7 @@ Variable_name Value > Opened_tables 3 > drop database mysqltest; > drop database db1; > +set @TID= (SELECT tid FROM information_schema.processlist); > +select (SELECT tid FROM information_schema.processlist) = @TID; > +(SELECT tid FROM information_schema.processlist) = @TID > +1 That seems pretty useless as a test :) > diff --git a/sql/sql_class.cc b/sql/sql_class.cc > index bf161b2..0478b33 100644 > --- a/sql/sql_class.cc > +++ b/sql/sql_class.cc > @@ -69,6 +69,10 @@ > #include "sql_connect.h" > #include "my_atomic.h" > > +#ifdef HAVE_SYS_SYSCALL_H Pardon me? Did you see whether your code actually work? You check here whether HAVE_SYS_SYSCALL_H is defined, but you don't have CHECK_INCLUDE_FILES(sys/syscall.h HAVE_SYS_SYSCALL_H) in configure.cmake and HAVE_SYS_SYSCALL_H in config.h.cmake. So, I don't see how your code can possibly work as HAVE_SYS_SYSCALL_H should be never defined in your patch. Please, when fixing it, make sure that your test *fails* without TID support (I suspect you'll have to enable it only on linux). And then you could remove that useless test above. > +#include <sys/syscall.h> > +#endif Regards, Sergei

2 2

[Maria-developers] MDEV-3929 Add system variable explicit_defaults_for_timestamp for compatibility with MySQL
by Alexander Barkov 15 Sep '15

15 Sep '15

Hi Sergei, Please review a patch that merges a new read-only variables --explicit-defaults-for-timestamp from MySQL. Note, the original MySQL patch updates many tests, to make the tests independent from the compiled-in default --explicit-defaults-for-timestamp value. I guess Oracle is planning to change the default value to ON eventually. I merged these changes for tests as well. As a result, all tests pass in both "mtr" and "mtr --mysqld=--explicit-defaults-for-timestamp", which I think is good. In addition to the original MySQL changes in mtr, I also added two tests that describe specific behavior: sys_vars.explicit_defaults_for_timestamp_off sys_vars.explicit_defaults_for_timestamp_on Note, the patch assumes that the server and the slave have the same --explicit-defaults-for-timeatamp. Monty suggested to make this variable dynamic and replication-safe. We added a separate task for this: MDEV-8455 Make --explicit-defaults-for-timestamp dynamic I plan to do it in the next 10.1 sprint round. Thanks.

2 8

Re: [Maria-developers] [Commits] 8983790: MDEV-7970: EXPLAIN FORMAT=JSON does not print HAVING
by Oleksandr Byelkin 14 Sep '15

14 Sep '15

On 14.09.15 21:59, Sergey Petrunia wrote: > Hi Sanja, > > The big comment: I see HAVING being printed for EXPLAIN FORMAT=JSON but not for > ANALYZE FORMAT=JSON. > > For example: > > MariaDB [test]> explain format=json select count(*) from t1 where t1.a between 0 and 1000 group by b having count(*) > 0\G > *************************** 1. row *************************** > EXPLAIN: { > "query_block": { > "select_id": 1, > "having_condition": "(count(0) > 0)", > "filesort": { > "temporary_table": { > "function": "buffer", > "table": { > "table_name": "t1", > "access_type": "ALL", > "rows": 1000, > "filtered": 100, > "attached_condition": "(t1.a between 0 and 1000)" > } > } > } > } > } > > MariaDB [test]> analyze format=json select count(*) from t1 where t1.a between 0 and 1000 group by b having count(*) > 0\G > *************************** 1. row *************************** > ANALYZE: { > "query_block": { > "select_id": 1, > "r_loops": 1, > "r_total_time_ms": 49.417, > "filesort": { > "r_loops": 1, > "r_total_time_ms": 0.4251, > "r_used_priority_queue": false, > "r_output_rows": 101, > "r_buffer_size": "2Kb", > "temporary_table": { > "table": { > "table_name": "t1", > "access_type": "ALL", > "r_loops": 1, > "rows": 1000, > "r_rows": 1000, > "r_total_time_ms": 18.597, > "filtered": 100, > "r_filtered": 100, > "attached_condition": "(t1.a between 0 and 1000)" > } > } > } > } > } oops, I'll fix. > > Smaller comments below. > > On Wed, Sep 09, 2015 at 04:29:54PM +0200, sanja(a)mariadb.com wrote: >> revision-id: 8983790df9a16520e69905fc4c35d20f7c935c3e (mariadb-10.1.6-119-g8983790) >> parent(s): 3fcd84c2891f4d2c881f13b53bc5a2401870b80a >> committer: Oleksandr Byelkin >> timestamp: 2015-09-09 16:29:50 +0200 >> message: >> >> MDEV-7970: EXPLAIN FORMAT=JSON does not print HAVING >> >> Printing non-trivial HAVING added. >> >> --- >> mysql-test/r/explain_json.result | 84 ++++++++++++++++++++++++++++++++++++++++ >> mysql-test/t/explain_json.test | 23 ++++++++++- >> sql/sql_explain.cc | 15 ++++++- >> sql/sql_explain.h | 7 +++- >> sql/sql_select.cc | 2 + >> 5 files changed, 128 insertions(+), 3 deletions(-) >> >> diff --git a/mysql-test/r/explain_json.result b/mysql-test/r/explain_json.result >> index 0507cee..db2726d 100644 >> --- a/mysql-test/r/explain_json.result >> +++ b/mysql-test/r/explain_json.result >> @@ -799,6 +799,7 @@ EXPLAIN >> { >> "query_block": { >> "select_id": 2, >> + "having_condition": "trigcond(<is_not_null_test>(t1.a))", >> "full-scan-on-null_key": { >> "table": { >> "table_name": "t1", >> @@ -1070,3 +1071,86 @@ EXPLAIN >> } >> } >> drop table t1; >> +# >> +# MDEV-7970: EXPLAIN FORMAT=JSON does not print HAVING >> +# >> +create table t0(a int); >> +insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); >> +create table t1(a int); >> +insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C; >> +create table t2 ( >> +a int, >> +b int, >> +key (a) >> +); >> +insert into t2 select A.a*1000 + B.a, A.a*1000 + B.a from t0 A, t1 B; >> +# normal HAVING >> +explain format=json select a, max(b) as TOP from t2 group by a having TOP > a; >> +EXPLAIN >> +{ >> + "query_block": { >> + "select_id": 1, >> + "having_condition": "(TOP > t2.a)", >> + "filesort": { >> + "temporary_table": { >> + "function": "buffer", >> + "table": { >> + "table_name": "t2", >> + "access_type": "ALL", >> + "rows": 10000, >> + "filtered": 100 >> + } >> + } >> + } >> + } >> +} >> +# HAVING is always TRUE (not printed) >> +explain format=json select a, max(b) as TOP from t2 group by a having 1<>2; >> +EXPLAIN >> +{ >> + "query_block": { >> + "select_id": 1, >> + "filesort": { >> + "temporary_table": { >> + "function": "buffer", >> + "table": { >> + "table_name": "t2", >> + "access_type": "ALL", >> + "rows": 10000, >> + "filtered": 100 >> + } >> + } >> + } >> + } >> +} >> +# HAVING is always FALSE (intercepted by message) >> +explain format=json select a, max(b) as TOP from t2 group by a having 1=2; >> +EXPLAIN >> +{ >> + "query_block": { >> + "select_id": 1, >> + "table": { >> + "message": "Impossible HAVING" >> + } >> + } >> +} >> +# HAVING is absent >> +explain format=json select a, max(b) as TOP from t2 group by a; >> +EXPLAIN >> +{ >> + "query_block": { >> + "select_id": 1, >> + "filesort": { >> + "temporary_table": { >> + "function": "buffer", >> + "table": { >> + "table_name": "t2", >> + "access_type": "ALL", >> + "rows": 10000, >> + "filtered": 100 >> + } >> + } >> + } >> + } >> +} >> +drop table t0, t1, t2; >> diff --git a/mysql-test/t/explain_json.test b/mysql-test/t/explain_json.test >> index 3e6f34b..0870817 100644 >> --- a/mysql-test/t/explain_json.test >> +++ b/mysql-test/t/explain_json.test >> @@ -278,4 +278,25 @@ explain format=json select count(distinct a1,a2,b,c) from t1 where (a2 >= 'b') a >> >> drop table t1; >> >> - >> +--echo # >> +--echo # MDEV-7970: EXPLAIN FORMAT=JSON does not print HAVING >> +--echo # >> +create table t0(a int); >> +insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); >> +create table t1(a int); >> +insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C; >> +create table t2 ( >> + a int, >> + b int, >> + key (a) >> +); >> +insert into t2 select A.a*1000 + B.a, A.a*1000 + B.a from t0 A, t1 B; > This seems to be excessive. I don't see any examples using key(a), I don't see a need to > populate a table with 1M rows. I was not the man who made the test suite, usually sotuation is reverse somebody require to keep the original. But I agree, I'll fix. >> +--echo # normal HAVING >> +explain format=json select a, max(b) as TOP from t2 group by a having TOP > a; >> +--echo # HAVING is always TRUE (not printed) >> +explain format=json select a, max(b) as TOP from t2 group by a having 1<>2; >> +--echo # HAVING is always FALSE (intercepted by message) >> +explain format=json select a, max(b) as TOP from t2 group by a having 1=2; >> +--echo # HAVING is absent >> +explain format=json select a, max(b) as TOP from t2 group by a; >> +drop table t0, t1, t2; >> diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc >> index 15ee67a..5f60aee 100644 >> --- a/sql/sql_explain.cc >> +++ b/sql/sql_explain.cc >> @@ -862,7 +862,20 @@ void Explain_select::print_explain_json(Explain_query *query, >> writer->add_member("const_condition"); >> write_item(writer, exec_const_cond); >> } >> - >> + /* we do not print always TRUE HAVING */ > This doesn't parse. Did you mean: > " Do not print HAVING clause if it always evaluates to TRUE" ? yes > >> + if (having || (having_value == Item::COND_FALSE)) >> + { >> + writer->add_member("having_condition"); >> + if (likely(having)) >> + write_item(writer, having); >> + else >> + { >> + /* Normally we should not go this branch, left just for safety */ >> + DBUG_ASSERT(having_value == Item::COND_FALSE); >> + writer->add_str("0"); >> + } >> + } >> + >> Filesort_tracker *first_table_sort= NULL; >> bool first_table_sort_used= false; >> int started_objects= 0; >> diff --git a/sql/sql_explain.h b/sql/sql_explain.h >> index f92a576..434be47 100644 >> --- a/sql/sql_explain.h >> +++ b/sql/sql_explain.h >> @@ -209,6 +209,7 @@ class Explain_select : public Explain_basic_join >> Explain_select(MEM_ROOT *root, bool is_analyze) : >> Explain_basic_join(root), >> message(NULL), >> + having(NULL), having_value(Item::COND_UNDEF), >> using_temporary(false), using_filesort(false), >> time_tracker(is_analyze), >> ops_tracker(is_analyze) >> @@ -231,7 +232,11 @@ class Explain_select : public Explain_basic_join >> >> /* Expensive constant condition */ >> Item *exec_const_cond; >> - >> + >> + /* HAVING condition */ >> + COND *having; >> + Item::cond_result having_value; >> + >> /* Global join attributes. In tabular form, they are printed on the first row */ >> bool using_temporary; >> bool using_filesort; >> diff --git a/sql/sql_select.cc b/sql/sql_select.cc >> index 3f2c2ea..be4b076 100644 >> --- a/sql/sql_select.cc >> +++ b/sql/sql_select.cc >> @@ -24159,6 +24159,8 @@ int JOIN::save_explain_data_intern(Explain_query *output, bool need_tmp_table, >> xpl_sel->using_filesort= true; >> >> xpl_sel->exec_const_cond= exec_const_cond; >> + xpl_sel->having= having; >> + xpl_sel->having_value= having_value; >> >> JOIN_TAB* const first_top_tab= join->first_breadth_first_optimization_tab(); >> JOIN_TAB* prev_bush_root_tab= NULL; > BR > Sergei

1 0

Re: [Maria-developers] [Commits] 93a7c11: MDEV-8380: Subquery parse error
by Sergei Golubchik 14 Sep '15

14 Sep '15

Hi, Sanja! On Aug 31, sanja(a)mariadb.com wrote: > revision-id: 93a7c11c51e2f5c0ca98600924172e452b6188b6 (mariadb-10.1.6-24-g93a7c11) > parent(s): d07b780db239a909e667edf5657e3633e80d1451 > committer: Oleksandr Byelkin > timestamp: 2015-08-31 13:10:01 +0200 > message: > > MDEV-8380: Subquery parse error > > backport mysql parser fixes > 0034963fbf199696792491bcb79d5f0731c98804 > 5948561812bc691bd0c13cf518a3fe77d9daf920 > diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc > index 6c835c4..1d9aca9 100644 > --- a/sql/sql_lex.cc > +++ b/sql/sql_lex.cc > @@ -546,6 +546,7 @@ void lex_start(THD *thd) > lex->limit_rows_examined_cnt= ULONGLONG_MAX; > lex->var_list.empty(); > lex->stmt_var_list.empty(); > + lex->proc_list.elements=0; why? this wasn't in the patches you've backported. > > lex->is_lex_started= TRUE; > DBUG_VOID_RETURN; > @@ -852,6 +853,29 @@ bool Lex_input_stream::get_text(LEX_STRING *dst, int pre_skip, int post_skip) > } > > > +uint Lex_input_stream::get_lineno(const char *raw_ptr) > +{ > + DBUG_ASSERT(m_buf <= raw_ptr && raw_ptr < m_end_of_query); > + if (!(m_buf <= raw_ptr && raw_ptr < m_end_of_query)) > + return 1; > + > + uint ret= 1; > + const CHARSET_INFO *cs= m_thd->charset(); > + for (const char *c= m_buf; c < raw_ptr; c++) > + { > + uint mb_char_len; > + if (use_mb(cs) && (mb_char_len= my_ismbchar(cs, c, m_end_of_query))) > + { > + c+= mb_char_len - 1; // skip the rest of the multibyte character > + continue; // we don't expect '\n' there > + } > + if (*c == '\n') > + ret++; > + } > + return ret; > +} why? this doesn't seem to be used anywhere. > + > + > /* > ** Calc type of integer; long integer, longlong integer or real. > ** Returns smallest type that match the string. > diff --git a/sql/sql_lex.h b/sql/sql_lex.h > index 09a3d5e..529c4d5 100644 > --- a/sql/sql_lex.h > +++ b/sql/sql_lex.h > @@ -2087,6 +2087,8 @@ class Lex_input_stream > CHARSET_INFO *txt_cs, > const char *end_ptr); > > + uint get_lineno(const char *raw_ptr); > + > /** Current thread. */ > THD *m_thd; > > diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc > index 5e58ceb..f7eed09 100644 > --- a/sql/sql_parse.cc > +++ b/sql/sql_parse.cc > @@ -6932,11 +6932,28 @@ mysql_new_select(LEX *lex, bool move_down) > } > else > { > + bool const outer_most= (lex->current_select->master_unit() == &lex->unit); > + if (outer_most && lex->result) > + { > + my_error(ER_WRONG_USAGE, MYF(0), "UNION", "INTO"); > + DBUG_RETURN(TRUE); > + } > + if (lex->proc_list.elements!=0) > + { > + my_error(ER_WRONG_USAGE, MYF(0), "UNION", > + "SELECT ... PROCEDURE ANALYSE()"); > + DBUG_RETURN(TRUE); > + } why couldn't parser do it? > if (lex->current_select->order_list.first && !lex->current_select->braces) > { > my_error(ER_WRONG_USAGE, MYF(0), "UNION", "ORDER BY"); > DBUG_RETURN(1); > } > + if (lex->current_select->explicit_limit && !lex->current_select->braces) > + { > + my_error(ER_WRONG_USAGE, MYF(0), "UNION", "LIMIT"); > + DBUG_RETURN(1); > + } why couldn't parser do it? > select_lex->include_neighbour(lex->current_select); > SELECT_LEX_UNIT *unit= select_lex->master_unit(); > if (!unit->fake_select_lex && unit->add_fake_select_lex(lex->thd)) > diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy > index 0e2db26..b79c2ce 100644 > --- a/sql/sql_yacc.yy > +++ b/sql/sql_yacc.yy > @@ -1,5 +1,5 @@ > /* > - Copyright (c) 2000, 2015, Oracle and/or its affiliates. > + Copyrig ht(c) 2000, 2015, Oracle and/or its affiliates. typo? > Copyright (c) 2010, 2015, MariaDB > > This program is free software; you can redistribute it and/or modify > @@ -1001,10 +1001,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); > %parse-param { THD *thd } > %lex-param { THD *thd } > /* > - Currently there are 164 shift/reduce conflicts. > + Currently there are 160 shift/reduce conflicts. > We should not introduce new conflicts any more. > */ > -%expect 164 > +%expect 160 > > /* > Comments for TOKENS. > @@ -1731,6 +1731,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); > opt_default_time_precision > case_stmt_body opt_bin_mod > opt_if_exists_table_element opt_if_not_exists_table_element > + opt_into opt_procedure_clause > > %type <object_ddl_options> > create_or_replace > @@ -5548,7 +5549,7 @@ create_select: > { > Select->parsing_place= NO_MATTER; > } > - opt_select_from > + table_expression > { > /* > The following work only with the local list, the global list > @@ -5943,11 +5944,6 @@ merge_insert_types: > | LAST_SYM { $$= MERGE_INSERT_TO_LAST; } > ; > > -opt_select_from: > - opt_limit_clause {} > - | select_from opt_select_lock_type > - ; > - > udf_type: > STRING_SYM {$$ = (int) STRING_RESULT; } > | REAL {$$ = (int) REAL_RESULT; } > @@ -8397,6 +8393,7 @@ select_paren_derived: > Lex->current_select->set_braces(true); > } > SELECT_SYM select_part2_derived > + table_expression > { > if (setup_select_in_parentheses(Lex)) > MYSQL_YYABORT; > @@ -8414,7 +8411,45 @@ select_init2: > union_clause > ; > > +/* > + Theoretically we can merge all 3 right hand sides of the select_part2 > + rule into one, however such a transformation adds one shift/reduce > + conflict more. > +*/ > select_part2: > + select_options_and_item_list > + opt_order_clause > + opt_limit_clause > + opt_select_lock_type > + | select_options_and_item_list into opt_select_lock_type > + | select_options_and_item_list > + opt_into > + from_clause > + opt_where_clause > + opt_group_clause > + opt_having_clause > + opt_order_clause > + opt_limit_clause > + opt_procedure_clause > + opt_into > + opt_select_lock_type why not table_expression here? > + { > + if ($2 && $10) > + { > + /* double "INTO" clause */ > + my_error(ER_WRONG_USAGE, MYF(0), "INTO", "INTO"); > + MYSQL_YYABORT; > + } > + if ($9 && ($2 || $10)) > + { > + /* "INTO" with "PROCEDURE ANALYSE" */ > + my_error(ER_WRONG_USAGE, MYF(0), "PROCEDURE", "INTO"); > + MYSQL_YYABORT; > + } > + } Why couldn't parser do that? > + ; > + > +select_options_and_item_list: > { > LEX *lex= Lex; > SELECT_LEX *sel= lex->current_select; > @@ -8426,27 +8461,36 @@ select_part2: > { > Select->parsing_place= NO_MATTER; > } > - select_into opt_select_lock_type > ; > > -select_into: > - opt_order_clause opt_limit_clause {} > - | into > - | select_from > - | into select_from > - | select_from into > +table_expression: > + opt_from_clause > + opt_where_clause > + opt_group_clause > + opt_having_clause > + opt_order_clause > + opt_limit_clause > + opt_procedure_clause > + opt_select_lock_type > + ; > + > +from_clause: > + FROM table_reference_list > + ; > + > +opt_from_clause: > + /* empty */ > + | from_clause > ; > > -select_from: > - FROM join_table_list > +table_reference_list: > + join_table_list > { > Select->context.table_list= > Select->context.first_name_resolution_table= > Select->table_list.first; > } > - opt_where_clause opt_group_clause opt_having_clause > - opt_order_clause opt_limit_clause opt_procedure_clause > - | FROM DUAL_SYM opt_where_clause opt_limit_clause > + | DUAL_SYM > /* oracle compatibility: oracle always requires FROM clause, > and DUAL is system table without fields. > Is "SELECT 1 FROM DUAL" any better than "SELECT 1" ? > @@ -10888,9 +10932,7 @@ select_derived_union: > last select in the union. > */ > Lex->pop_context(); > - } > - opt_union_order_or_limit > - { > + > if ($1 != NULL) > { > my_parse_error(ER_THD(thd, ER_SYNTAX_ERROR)); > @@ -10910,12 +10952,14 @@ select_init2_derived: > my_parse_error(ER_THD(thd, ER_SYNTAX_ERROR)); > MYSQL_YYABORT; > } > + /* > if (sel->linkage == UNION_TYPE && > sel->master_unit()->first_select()->braces) > { > my_parse_error(ER_THD(thd, ER_SYNTAX_ERROR)); > MYSQL_YYABORT; > } > + */ what was wrong with that? if it's not needed anymore, delete it, don't just comment it out. > } > ; > > @@ -10932,7 +10976,6 @@ select_part2_derived: > { > Select->parsing_place= NO_MATTER; > } > - opt_select_from opt_select_lock_type > ; > > /* handle contents of parentheses in join expression */ > @@ -10980,7 +11023,7 @@ select_derived2: > { > Select->parsing_place= NO_MATTER; > } > - opt_select_from > + table_expression > ; > > get_select_lex: > @@ -11556,7 +11599,7 @@ choice: > ; > > opt_procedure_clause: > - /* empty */ > + /* empty */ { $$= false; } > | PROCEDURE_SYM ident /* Procedure name */ > { > LEX *lex=Lex; > @@ -11585,6 +11628,9 @@ opt_procedure_clause: > Lex->uncacheable(UNCACHEABLE_SIDEEFFECT); > } > '(' procedure_list ')' > + { > + $$= true; > + } > ; > > procedure_list: > @@ -11661,6 +11707,11 @@ select_outvar: > } > ; > > +opt_into: > + /* empty */ { $$= false; } > + | into { $$= true; } > + ; > + > into: > INTO > { > @@ -12496,7 +12547,8 @@ show_param: > { > LEX *lex= Lex; > lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS; > - } opt_limit_clause > + } > + opt_limit_clause > | RELAYLOG_SYM optional_connection_name EVENTS_SYM binlog_in binlog_from > { > LEX *lex= Lex; > @@ -15836,17 +15888,19 @@ union_option: > > query_specification: > SELECT_SYM select_init2_derived > - { > + table_expression > + { > $$= Lex->current_select->master_unit()->first_select(); > } > | '(' select_paren_derived ')' > + opt_union_order_or_limit > { > $$= Lex->current_select->master_unit()->first_select(); > } > ; > > query_expression_body: > - query_specification opt_union_order_or_limit > + query_specification > | query_expression_body > UNION_SYM union_option > { > @@ -15854,7 +15908,6 @@ query_expression_body: > MYSQL_YYABORT; > } > query_specification > - opt_union_order_or_limit > { > Lex->pop_context(); > $$= $1; > diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result > index 1d29f2c..01cc9d7 100644 > --- a/mysql-test/r/parser.result > +++ b/mysql-test/r/parser.result > @@ -650,3 +650,230 @@ CREATE TABLE t1(a INT); > SELECT * FROM t1 JOIN ((SELECT 1 AS b) UNION ALL (SELECT 2 AS b) ORDER BY b DESC) s1 WHERE a=1; > a b > DROP TABLE t1; > +# > +# Test of collective fix for three parser bugs: > +# > +# Bug #17727401, Bug #17426017, Bug #17473479: > +# The server accepts wrong syntax and then fails in different ways > +# > +CREATE TABLE t1 (i INT); > +# bug #17426017 > +SELECT (SELECT EXISTS(SELECT * LIMIT 1 ORDER BY VALUES (c00))); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY VALUES (c00)))' at line 1 > +# bug#17473479 > +CREATE TABLE a(a int); > +CREATE TABLE b(a int); > +DELETE FROM b ORDER BY(SELECT 1 FROM a ORDER BY a ORDER BY a); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY a)' at line 1 > +DROP TABLE a, b; > +# bug #17727401 > +SELECT '' IN (SELECT '1' c FROM t1 ORDER BY '' ORDER BY '') FROM t1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY '') FROM t1' at line 1 > +# regression & coverage tests > +# uniform syntax for FROM DUAL clause: > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +FOR UPDATE; > +1 > +1 > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +PROCEDURE ANALYSE() FOR UPDATE; > +ERROR HY000: Can't use ORDER clause with this procedure > +SELECT 1 FROM > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +FOR UPDATE) a; > +1 > +1 > +SELECT 1 FROM > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +PROCEDURE ANALYSE() FOR UPDATE) a; > +ERROR HY000: Incorrect usage of PROCEDURE and subquery > +SELECT 1 FROM t1 > +WHERE EXISTS(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +FOR UPDATE); > +1 > +SELECT 1 FROM t1 > +WHERE EXISTS(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +PROCEDURE ANALYSE() FOR UPDATE); > +ERROR HY000: Incorrect usage of PROCEDURE and subquery > +SELECT 1 FROM t1 > +UNION > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +FOR UPDATE; > +1 > +1 > +SELECT 1 FROM t1 > +UNION > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +PROCEDURE ANALYSE() FOR UPDATE; > +ERROR HY000: Incorrect usage of PROCEDURE and subquery > +SELECT 1 FROM DUAL PROCEDURE ANALYSE() > +UNION > +SELECT 1 FROM t1; > +ERROR HY000: Incorrect usage of UNION and SELECT ... PROCEDURE ANALYSE() > +(SELECT 1 FROM t1) > +UNION > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +FOR UPDATE); > +1 > +1 > +(SELECT 1 FROM t1) > +UNION > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +PROCEDURE ANALYSE() FOR UPDATE); > +ERROR HY000: Incorrect usage of PROCEDURE and subquery > +# "FOR UPDATE" tests > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +1 > +SELECT 1 FROM t1 FOR UPDATE UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +1 > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 FOR UPDATE; > +1 > +# "INTO" clause tests > +SELECT 1 FROM t1 INTO @var17727401; > +Warnings: > +Warning 1329 No data - zero rows fetched, selected, or processed > +SELECT 1 FROM DUAL INTO @var17727401; > +SELECT 1 INTO @var17727401; > +SELECT 1 INTO @var17727401 FROM t1; > +Warnings: > +Warning 1329 No data - zero rows fetched, selected, or processed > +SELECT 1 INTO @var17727401 FROM DUAL; > +SELECT 1 INTO @var17727401_1 FROM t1 INTO @var17727401_2; > +ERROR HY000: Incorrect usage of INTO and INTO > +SELECT 1 INTO @var17727401_1 FROM DUAL > +INTO @var17727401_2; > +ERROR HY000: Incorrect usage of INTO and INTO > +SELECT 1 INTO @var17727401 FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1; > +Warnings: > +Warning 1329 No data - zero rows fetched, selected, or processed > +SELECT 1 FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1 INTO @var17727401; > +Warnings: > +Warning 1329 No data - zero rows fetched, selected, or processed > +SELECT 1 FROM t1 WHERE 1 INTO @var17727401 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1' at line 1 > +SELECT 1 INTO @var17727401_1 > +FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1 > +INTO @var17727401_2; > +ERROR HY000: Incorrect usage of INTO and INTO > +SELECT (SELECT 1 FROM t1 INTO @var17727401); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var17727401)' at line 1 > +SELECT 1 FROM (SELECT 1 FROM t1 INTO @var17727401) a; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var17727401) a' at line 1 > +SELECT EXISTS(SELECT 1 FROM t1 INTO @var17727401); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var17727401)' at line 1 > +SELECT 1 FROM t1 INTO @var17727401 UNION SELECT 1 FROM t1 INTO t1; > +ERROR HY000: Incorrect usage of UNION and INTO > +(SELECT 1 FROM t1 INTO @var17727401) UNION (SELECT 1 FROM t1 INTO t1); > +ERROR HY000: Incorrect usage of UNION and INTO > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 INTO @var17727401; > +Warnings: > +Warning 1329 No data - zero rows fetched, selected, or processed > +SELECT 1 INTO @var17727401 FROM t1 PROCEDURE ANALYSE(); > +ERROR HY000: Incorrect usage of PROCEDURE and INTO > +SELECT 1 FROM t1 PROCEDURE ANALYSE() INTO @var17727401; > +ERROR HY000: Incorrect usage of PROCEDURE and INTO > +# ORDER and LIMIT clause combinations > +(SELECT 1 FROM t1 ORDER BY 1) ORDER BY 1; > +1 > +(SELECT 1 FROM t1 LIMIT 1) LIMIT 1; > +1 > +((SELECT 1 FROM t1 ORDER BY 1) ORDER BY 1) ORDER BY 1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1) ORDER BY 1' at line 1 > +((SELECT 1 FROM t1 LIMIT 1) LIMIT 1) LIMIT 1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'LIMIT 1) LIMIT 1' at line 1 > +(SELECT 1 FROM t1 ORDER BY 1) LIMIT 1; > +1 > +(SELECT 1 FROM t1 LIMIT 1) ORDER BY 1; > +1 > +((SELECT 1 FROM t1 ORDER BY 1) LIMIT 1) ORDER BY 1); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'LIMIT 1) ORDER BY 1)' at line 1 > +((SELECT 1 FROM t1 LIMIT 1) ORDER BY 1) LIMIT 1); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1) LIMIT 1)' at line 1 > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1; > +1 > +SELECT (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1); > +(SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1) > +NULL > +SELECT 1 FROM (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1) a; > +1 > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1; > +1 > +SELECT (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1); > +(SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1) > +NULL > +SELECT 1 FROM (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1) a; > +1 > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +1 > +SELECT (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1); > +(SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1) > +NULL > +SELECT 1 FROM (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1) a; > +1 > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1 ORDER BY 1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1' at line 1 > +SELECT (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1 ORDER BY 1); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1)' at line 1 > +SELECT 1 FROM (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1 ORDER BY 1) a; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1) a' at line 1 > +SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1); > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1) a; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1); > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1) a; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT (SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1); > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM (SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1) a; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM t1 LIMIT 1 ORDER BY 1 UNION SELECT 1 FROM t1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1 UNION SELECT 1 FROM t1' at line 1 > +SELECT (SELECT 1 FROM t1 LIMIT 1 ORDER BY 1 UNION SELECT 1 FROM t1); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1 UNION SELECT 1 FROM t1)' at line 1 > +SELECT 1 FROM (SELECT 1 FROM t1 LIMIT 1 ORDER BY 1 UNION SELECT 1 FROM t1) a; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 ORDER BY 1; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 ORDER BY 1); > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 ORDER BY 1) a; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1); > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1) a; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1); > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1) a; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1); > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1) a; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +DROP TABLE t1; > +# > +# MDEV-8380: Subquery parse error > +# > +CREATE TABLE t1 ( a INT); > +INSERT INTO t1 VALUES ( 2 ); > +SELECT * > +FROM ( (SELECT a FROM t1 ORDER BY a) UNION (SELECT 1 as b ORDER BY b ) ) AS a1 > +WHERE a1.a = 1 OR a1.a = 2; > +a > +2 > +1 > +DROP TABLE t1; > diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result > index 3732f62..b9f9fb0 100644 > --- a/mysql-test/r/subselect.result > +++ b/mysql-test/r/subselect.result > @@ -5132,8 +5132,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5175,7 +5176,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5294,7 +5295,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/subselect_no_exists_to_in.result b/mysql-test/r/subselect_no_exists_to_in.result > index 140b790..902c45f 100644 > --- a/mysql-test/r/subselect_no_exists_to_in.result > +++ b/mysql-test/r/subselect_no_exists_to_in.result > @@ -5134,8 +5134,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5177,7 +5178,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5296,7 +5297,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result > index 99ac9f4..89034b7 100644 > --- a/mysql-test/r/subselect_no_mat.result > +++ b/mysql-test/r/subselect_no_mat.result > @@ -5132,8 +5132,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5175,7 +5176,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5294,7 +5295,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result > index 7ecd40c..6e90aac 100644 > --- a/mysql-test/r/subselect_no_opts.result > +++ b/mysql-test/r/subselect_no_opts.result > @@ -5128,8 +5128,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5171,7 +5172,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5290,7 +5291,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result > index c70db6f..1c18817 100644 > --- a/mysql-test/r/subselect_no_scache.result > +++ b/mysql-test/r/subselect_no_scache.result > @@ -5138,8 +5138,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5181,7 +5182,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5300,7 +5301,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result > index 6a7d6b3..de9c4e8 100644 > --- a/mysql-test/r/subselect_no_semijoin.result > +++ b/mysql-test/r/subselect_no_semijoin.result > @@ -5128,8 +5128,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5171,7 +5172,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5290,7 +5291,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result > index ef1749e..9b7a1c5 100644 > --- a/mysql-test/r/union.result > +++ b/mysql-test/r/union.result > @@ -89,6 +89,10 @@ id select_type table type possible_keys key key_len ref rows filtered Extra > NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL NULL Using filesort > Warnings: > Note 1003 (select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` limit 2) union all (select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` order by `test`.`t2`.`a` limit 1) order by `b` desc > +select count(*) from ( > +(select a,b from t1 limit 2) union all (select a,b from t2 order by a)) q; > +count(*) > +6 > (select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2; > a b > 1 a > @@ -96,6 +100,10 @@ a b > select found_rows(); > found_rows() > 6 > +select count(*) from ( > +select a,b from t1 union all select a,b from t2) q; > +count(*) > +8 > select sql_calc_found_rows a,b from t1 union all select a,b from t2 limit 2; > a b > 1 a > @@ -308,12 +316,20 @@ create table t1 (a int); > insert into t1 values (1),(2),(3); > create table t2 (a int); > insert into t2 values (3),(4),(5); > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1) UNION all (SELECT * FROM t2)) q; > +COUNT(*) > +6 > (SELECT SQL_CALC_FOUND_ROWS * FROM t1) UNION all (SELECT * FROM t2) LIMIT 1; > a > 1 > select found_rows(); > found_rows() > 6 > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2)) q; > +COUNT(*) > +4 > (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2) LIMIT 2; > a > 1 > @@ -321,6 +337,10 @@ a > select found_rows(); > found_rows() > 4 > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2)) q; > +COUNT(*) > +4 > (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2); > a > 1 > @@ -330,6 +350,10 @@ a > select found_rows(); > found_rows() > 4 > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1) UNION all (SELECT * FROM t2 LIMIT 1)) q; > +COUNT(*) > +4 > (SELECT SQL_CALC_FOUND_ROWS * FROM t1) UNION all (SELECT * FROM t2 LIMIT 1); > a > 1 > @@ -345,6 +369,16 @@ a > select found_rows(); > found_rows() > 4 > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +COUNT(*) > +4 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1; > +a > +1 > +select found_rows(); > +found_rows() > +4 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION all SELECT * FROM t2 LIMIT 2; > ERROR HY000: Incorrect usage of UNION and LIMIT > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION all SELECT * FROM t2 LIMIT 2; > @@ -354,13 +388,29 @@ a > select found_rows(); > found_rows() > 6 > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION SELECT * FROM t2) q; > +COUNT(*) > +5 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 2; > a > 1 > 2 > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all SELECT * FROM t2) q; > +COUNT(*) > +4 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all SELECT * FROM t2 LIMIT 2; > +a > +1 > +3 > select found_rows(); > found_rows() > -5 > +4 > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION all SELECT * FROM t2) q; > +COUNT(*) > +6 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 100; > a > 1 > @@ -373,10 +423,39 @@ found_rows() > 5 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100 UNION SELECT * FROM t2; > ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 100) UNION SELECT * FROM t2) q; > +COUNT(*) > +5 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100) UNION SELECT * FROM t2; > +a > +1 > +2 > +3 > +4 > +5 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION SELECT * FROM t2; > ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +COUNT(*) > +4 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2; > +a > +1 > +3 > +4 > +5 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION SELECT * FROM t2 LIMIT 2; > ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +COUNT(*) > +4 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 2; > +a > +1 > +3 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 2,2; > a > 3 > @@ -384,8 +463,21 @@ a > select found_rows(); > found_rows() > 5 > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION SELECT * FROM t2) q; > +COUNT(*) > +5 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2 UNION SELECT * FROM t2; > ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 limit 2,2) UNION SELECT * FROM t2) q; > +COUNT(*) > +3 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2) UNION SELECT * FROM t2; > +a > +3 > +4 > +5 > SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a desc LIMIT 1; > a > 5 > diff --git a/mysql-test/t/parser.test b/mysql-test/t/parser.test > index 31c6ab9..0a19b03 100644 > --- a/mysql-test/t/parser.test > +++ b/mysql-test/t/parser.test > @@ -765,3 +765,259 @@ DROP TABLE t1; > CREATE TABLE t1(a INT); > SELECT * FROM t1 JOIN ((SELECT 1 AS b) UNION ALL (SELECT 2 AS b) ORDER BY b DESC) s1 WHERE a=1; > DROP TABLE t1; > + > + > +--echo # > +--echo # Test of collective fix for three parser bugs: > +--echo # > +--echo # Bug #17727401, Bug #17426017, Bug #17473479: > +--echo # The server accepts wrong syntax and then fails in different ways > +--echo # > + > +CREATE TABLE t1 (i INT); > + > +--echo # bug #17426017 > +--error ER_PARSE_ERROR > +SELECT (SELECT EXISTS(SELECT * LIMIT 1 ORDER BY VALUES (c00))); > + > +--echo # bug#17473479 > +CREATE TABLE a(a int); > +CREATE TABLE b(a int); > +--error ER_PARSE_ERROR > +DELETE FROM b ORDER BY(SELECT 1 FROM a ORDER BY a ORDER BY a); > +DROP TABLE a, b; > + > +--echo # bug #17727401 > +--error ER_PARSE_ERROR > +SELECT '' IN (SELECT '1' c FROM t1 ORDER BY '' ORDER BY '') FROM t1; > + > +--echo # regression & coverage tests > + > +--echo # uniform syntax for FROM DUAL clause: > + > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + FOR UPDATE; > + > +--error ER_ORDER_WITH_PROC > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + PROCEDURE ANALYSE() FOR UPDATE; > + > +SELECT 1 FROM > + (SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + FOR UPDATE) a; > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM > + (SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + PROCEDURE ANALYSE() FOR UPDATE) a; > + > +SELECT 1 FROM t1 > + WHERE EXISTS(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + FOR UPDATE); > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM t1 > + WHERE EXISTS(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + PROCEDURE ANALYSE() FOR UPDATE); > + > +SELECT 1 FROM t1 > +UNION > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + FOR UPDATE; > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM t1 > +UNION > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + PROCEDURE ANALYSE() FOR UPDATE; > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM DUAL PROCEDURE ANALYSE() > +UNION > +SELECT 1 FROM t1; > + > +(SELECT 1 FROM t1) > +UNION > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + FOR UPDATE); > + > +--error ER_WRONG_USAGE > +(SELECT 1 FROM t1) > +UNION > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + PROCEDURE ANALYSE() FOR UPDATE); > + > +--echo # "FOR UPDATE" tests > + > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +SELECT 1 FROM t1 FOR UPDATE UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 FOR UPDATE; > + > + > +--echo # "INTO" clause tests > + > +SELECT 1 FROM t1 INTO @var17727401; > +SELECT 1 FROM DUAL INTO @var17727401; > +SELECT 1 INTO @var17727401; > + > +SELECT 1 INTO @var17727401 FROM t1; > +SELECT 1 INTO @var17727401 FROM DUAL; > + > +--error ER_WRONG_USAGE > +SELECT 1 INTO @var17727401_1 FROM t1 INTO @var17727401_2; > + > +--error ER_WRONG_USAGE > +SELECT 1 INTO @var17727401_1 FROM DUAL > + INTO @var17727401_2; > + > +SELECT 1 INTO @var17727401 FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1; > +SELECT 1 FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1 INTO @var17727401; > + > +--error ER_PARSE_ERROR > +SELECT 1 FROM t1 WHERE 1 INTO @var17727401 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1; > + > +--error ER_WRONG_USAGE > +SELECT 1 INTO @var17727401_1 > + FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1 > + INTO @var17727401_2; > + > +--error ER_PARSE_ERROR > +SELECT (SELECT 1 FROM t1 INTO @var17727401); > +--error ER_PARSE_ERROR > +SELECT 1 FROM (SELECT 1 FROM t1 INTO @var17727401) a; > +--error ER_PARSE_ERROR > +SELECT EXISTS(SELECT 1 FROM t1 INTO @var17727401); > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM t1 INTO @var17727401 UNION SELECT 1 FROM t1 INTO t1; > +--error ER_WRONG_USAGE > +(SELECT 1 FROM t1 INTO @var17727401) UNION (SELECT 1 FROM t1 INTO t1); > + > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 INTO @var17727401; > + > +--error ER_WRONG_USAGE > +SELECT 1 INTO @var17727401 FROM t1 PROCEDURE ANALYSE(); > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM t1 PROCEDURE ANALYSE() INTO @var17727401; > + > +--echo # ORDER and LIMIT clause combinations > + > +# Limited support for (SELECT ...) ORDER/LIMIT: > + > +(SELECT 1 FROM t1 ORDER BY 1) ORDER BY 1; > +(SELECT 1 FROM t1 LIMIT 1) LIMIT 1; > + > +--error ER_PARSE_ERROR > +((SELECT 1 FROM t1 ORDER BY 1) ORDER BY 1) ORDER BY 1; > +--error ER_PARSE_ERROR > +((SELECT 1 FROM t1 LIMIT 1) LIMIT 1) LIMIT 1; > + > +(SELECT 1 FROM t1 ORDER BY 1) LIMIT 1; > +(SELECT 1 FROM t1 LIMIT 1) ORDER BY 1; > + > +--error ER_PARSE_ERROR > +((SELECT 1 FROM t1 ORDER BY 1) LIMIT 1) ORDER BY 1); > +--error ER_PARSE_ERROR > +((SELECT 1 FROM t1 LIMIT 1) ORDER BY 1) LIMIT 1); > + > +# ORDER/LIMIT and UNION: > + > +let $q=SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1; > +eval $q; > +eval SELECT ($q); > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1; > +eval $q; > +eval SELECT ($q); > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +eval $q; > +eval SELECT ($q); > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1 ORDER BY 1; > +--error ER_PARSE_ERROR > +eval $q; > +--error ER_PARSE_ERROR > +eval SELECT ($q); > +--error ER_PARSE_ERROR > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 LIMIT 1 ORDER BY 1 UNION SELECT 1 FROM t1; > +--error ER_PARSE_ERROR > +eval $q; > +--error ER_PARSE_ERROR > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 ORDER BY 1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +DROP TABLE t1; > + > +--echo # > +--echo # MDEV-8380: Subquery parse error > +--echo # > +CREATE TABLE t1 ( a INT); > +INSERT INTO t1 VALUES ( 2 ); > +SELECT * > +FROM ( (SELECT a FROM t1 ORDER BY a) UNION (SELECT 1 as b ORDER BY b ) ) AS a1 > +WHERE a1.a = 1 OR a1.a = 2; > +DROP TABLE t1; > diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test > index 80efe7a..8fb9658 100644 > --- a/mysql-test/t/subselect.test > +++ b/mysql-test/t/subselect.test > @@ -4274,8 +4274,7 @@ SELECT * FROM ( > > # This was not allowed previously. Possibly, it should be allowed on the future. > # For now, the intent is to keep the fix as non-intrusive as possible. > ---error ER_PARSE_ERROR > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > SELECT * FROM (SELECT 1 UNION SELECT 1) t1a; > --error ER_PARSE_ERROR > @@ -4310,7 +4309,7 @@ SELECT * FROM (SELECT 1 a UNION SELECT 1 a ORDER BY a LIMIT 1) t1a; > # aliases after. > # > SELECT * FROM t1 JOIN (SELECT 1 UNION SELECT 1) alias ON 1; > ---error ER_PARSE_ERROR > +--error ER_DERIVED_MUST_HAVE_ALIAS > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > --error ER_PARSE_ERROR > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > @@ -4402,8 +4401,9 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > > --error ER_PARSE_ERROR > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ---error ER_PARSE_ERROR > +--error ER_DERIVED_MUST_HAVE_ALIAS > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > > --error ER_PARSE_ERROR > diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test > index b8b040b..56fb2e3 100644 > --- a/mysql-test/t/union.test > +++ b/mysql-test/t/union.test > @@ -26,8 +26,12 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g > --error 1250 > (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by t1.b; > explain extended (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc; > +select count(*) from ( > +(select a,b from t1 limit 2) union all (select a,b from t2 order by a)) q; > (select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2; > select found_rows(); > +select count(*) from ( > +select a,b from t1 union all select a,b from t2) q; > select sql_calc_found_rows a,b from t1 union all select a,b from t2 limit 2; > select found_rows(); > > @@ -206,18 +210,30 @@ create table t2 (a int); > insert into t2 values (3),(4),(5); > > # Test global limits > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1) UNION all (SELECT * FROM t2)) q; > (SELECT SQL_CALC_FOUND_ROWS * FROM t1) UNION all (SELECT * FROM t2) LIMIT 1; > select found_rows(); > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2)) q; > (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2) LIMIT 2; > select found_rows(); > > # Test cases where found_rows() should return number of returned rows > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2)) q; > (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2); > select found_rows(); > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1) UNION all (SELECT * FROM t2 LIMIT 1)) q; > (SELECT SQL_CALC_FOUND_ROWS * FROM t1) UNION all (SELECT * FROM t2 LIMIT 1); > select found_rows(); > (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1; > select found_rows(); > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1; > +select found_rows(); > > # In these case found_rows() should work > --error ER_WRONG_USAGE > @@ -226,20 +242,41 @@ SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION all SELECT * FROM t2 LIMIT 2; > select found_rows(); > > # The following examples will not be exact > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION SELECT * FROM t2) q; > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 2; > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all SELECT * FROM t2 LIMIT 2; > select found_rows(); > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION all SELECT * FROM t2) q; > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 100; > select found_rows(); > --error ER_WRONG_USAGE > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100 UNION SELECT * FROM t2; > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 100) UNION SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100) UNION SELECT * FROM t2; > --error ER_WRONG_USAGE > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION SELECT * FROM t2; > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2; > --error ER_WRONG_USAGE > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION SELECT * FROM t2 LIMIT 2; > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 2; > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 2,2; > select found_rows(); > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION SELECT * FROM t2) q; > --error ER_WRONG_USAGE > SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2 UNION SELECT * FROM t2; > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 limit 2,2) UNION SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2) UNION SELECT * FROM t2; > > # Test some limits with ORDER BY > SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a desc LIMIT 1; Regards, Sergei

2 2

Re: [Maria-developers] [Commits] 6811945e: MDEV-6756: map a linux pid (child pid) to a connection id shown in the output of SHOW PROCESSLIST
by Sergei Golubchik 14 Sep '15

14 Sep '15

Hi, Sanja! On Aug 12, sanja(a)mariadb.com wrote: > revision-id: 6811945eaf6a6e979d92739399b084bf4e00ae2d (mariadb-10.1.6-12-g6811945e) > parent(s): 86a3613d4e981c341e38291c9eeec5dc9f836fae > committer: Oleksandr Byelkin > timestamp: 2015-08-12 23:09:48 +0200 > message: > > MDEV-6756: map a linux pid (child pid) to a connection id shown in the output of SHOW PROCESSLIST > > Added tid & pid for Linux. > > diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result > index 2a918ad..5b3370b 100644 > --- a/mysql-test/r/information_schema.result > +++ b/mysql-test/r/information_schema.result > @@ -2066,3 +2066,18 @@ Variable_name Value > Opened_tables 3 > drop database mysqltest; > drop database db1; > +SHOW PROCESSLIST; > +Id User Host db Command Time State Info Progress > +# root # NULL Query # # SHOW PROCESSLIST 0.000 > +set @@old_mode=""; > +SHOW PROCESSLIST; Eh, no, please, don't change SHOW PROCESSLIST. Only add new columns to I_S.PROCESSLIST. And without OLD_MODE. > diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt > index 033a0e0..d1fbaa3 100644 > --- a/sql/CMakeLists.txt > +++ b/sql/CMakeLists.txt > @@ -143,6 +143,10 @@ SET (SQL_SOURCE > ${MYSYS_LIBWRAP_SOURCE} > ) > > +IF (CMAKE_SYSTEM_NAME MATCHES "Linux") > + ADD_DEFINITIONS(-DHAVE_TID_SYSCALL) > +ENDIF() Don't match OS name please, better use #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif ... #ifdef __NR_gettid ... #endif > + > IF (CMAKE_SYSTEM_NAME MATCHES "Linux" OR > CMAKE_SYSTEM_NAME MATCHES "Windows" OR > CMAKE_SYSTEM_NAME MATCHES "SunOS" OR > diff --git a/sql/sql_class.cc b/sql/sql_class.cc > index bf161b2..20c03fe 100644 > --- a/sql/sql_class.cc > +++ b/sql/sql_class.cc > @@ -2062,6 +2068,13 @@ bool THD::store_globals() > This allows us to move THD to different threads if needed. > */ > mysys_var->id= thread_id; > +#ifdef HAVE_TID_SYSCALL > + os_pid= getpid(); why would you want to have pid there? isn't it the same for all threads? > + os_thread_id= syscall(__NR_gettid); > +#else > + os_pid= 0; > + os_thread_id= 0; > +#endif > real_id= pthread_self(); // For debugging > mysys_var->stack_ends_here= thread_stack + // for consistency, see libevent_thread_proc > STACK_DIRECTION * (long)my_thread_stack_size; I didn't review the rest of the patch as without old_mode and SHOW PROCESSLIST changes most of it will disappear. Regards, Sergei

2 2

Re: [Maria-developers] [Commits] 5fab5b6: MDEV-8764: Wrong error when encrypted table can't be decrypted.
by Sergei Golubchik 13 Sep '15

13 Sep '15

Hi, Jan! On Sep 08, Jan Lindström wrote: > MDEV-8764: Wrong error when encrypted table can't be decrypted. > > Add a new error message when table is encrypted but decryption > fails. Use this new error message on InnoDB/XtraDB. > > diff --git a/include/my_handler_errors.h b/include/my_handler_errors.h > index a7afcfe..9e452b0 100644 > --- a/include/my_handler_errors.h > +++ b/include/my_handler_errors.h > @@ -94,7 +94,8 @@ static const char *handler_error_messages[]= > "Operation was interrupted by end user (probably kill command?)", > "Disk full", > "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump and restore the table to fix this", > - "Too many words in a FTS phrase or proximity search" > + "Too many words in a FTS phrase or proximity search", > + "Table encrypted but decryption failed" I'm not sure I like the wording ("table is encrypted" adds no useful information, it's not like there can be another error "table is not encrypted but decryption failed"). But that's up to you. And yes, I agree that this situation deserves a dedicated error message. > }; > > #endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */ > diff --git a/sql/handler.cc b/sql/handler.cc > index 1d1dae7..566db8a 100644 > --- a/sql/handler.cc > +++ b/sql/handler.cc > @@ -3518,6 +3519,10 @@ void handler::print_error(int error, myf errflag) > my_error(ER_NO_SUCH_TABLE_IN_ENGINE, errflag, table_share->db.str, > table_share->table_name.str); > DBUG_VOID_RETURN; > + case HA_ERR_DECRYPTION_FAILED: > + my_error(ER_DECRYPTION_FAILED, errflag, table_share->db.str, > + table_share->table_name.str); > + DBUG_VOID_RETURN; Is that needed? I'd rather use the default ER_GET_ERRMSG, which would be Got error 192 'Table encrypted but decryption failed" from InnoDB I think this is perfectly adequate error for internal engine errors. ER_xxx is for upper-level errors. > case HA_ERR_RBR_LOGGING_FAILED: > textno= ER_BINLOG_ROW_LOGGING_FAILED; > break; > diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt > index 59908dc..ff72a26 100644 > --- a/sql/share/errmsg-utf8.txt > +++ b/sql/share/errmsg-utf8.txt > @@ -7136,3 +7136,5 @@ ER_KILL_QUERY_DENIED_ERROR > eng "You are not owner of query %lu" > ger "Sie sind nicht Eigentümer von Abfrage %lu" > rus "Вы не являетесь владельцем запроса %lu" > +ER_DECRYPTION_FAILED 42S02 > + eng "Table '%-.192s.%-.192s' encrypted but decryption failed." In general, please prefer %`s.%`s over '%s.%s' the former uses correct identifier quoting, the second does not Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 7fd5554: MDEV-5171: Add support for --innodb-optimize-keys to mysqldump.
by Sergei Golubchik 12 Sep '15

12 Sep '15

Hi, Jan! First, we've discussed adding support for ALTER TABLE ... DISABLE KEYS to InnoDB. Did you try that? That would've been a better approach, generally I'd like to avoid adding plugin-specific options to a mysqldump utility (although, of course, InnoDB is not just any plugin, so we can always make an exception for it). On Jul 27, Jan Lindström wrote: > revision-id: 7fd55542893b6d9e75406e39b7be672d8a8f473c > parent(s): a6ab8ef9d7d465a3f0bc1cff6034ca97575629dd > committer: Jan Lindström > branch nick: 10.0-git > timestamp: 2015-07-27 13:02:57 +0300 > message: > > MDEV-5171: Add support for --innodb-optimize-keys to mysqldump. > > Merged revision 93 from bzr+ssh://bazaar.launchpad.net/+branch/percona-server/5.6/ > authored by Alexey Kopytov. > > However, internal parser is rewriten to support unquoted identifiers and > multi-column keys. > > This patch expands the applicability of InnoDB fast index creation to > mysqldump, ALTER TABLE and OPTIMIZE TABLE as follows: > > 1. mysqldump has now a new option, --innodb-optimize-keys, which changes > the way InnoDB tables are dumped so that secondary and foreign keys are > created after loading the data thus taking advantage of fast index > creation. > > This part of the patch is an implementation of the feature request > reported as MySQL bug #49120. > > More specifically: > > - KEY, UNIQUE KEY and CONSTRAINT specifications are omitted from CREATE > TABLE corresponding to InnoDB tables. > > - an additional ALTER TABLE is issued after dumping the data to create > the previously omitted keys. > > Delaying foreign key creation does not introduce any additional risks as > mysqldump always prepends its output with SET FOREIGN_KEY_CHECKS=0 anyway. > > 2. When ALTER TABLE requires a table copy, secondary keys are now dropped > and recreated later after copying the data. The following restrictions > apply: > > - only non-unique keys can be involved in this optimization > > - if the table contains foreign keys, or a foreign key is being added as > a part of the current ALTER TABLE statement, the optimization is > disabled for all keys. > > This part of the patch is an implementation of the feature request > reported as MySQL bug #57583. > > 3. As OPTIMIZE TABLE is mapped to ALTER TABLE ... ENGINE=InnoDB for > InnoDB tables, it now also benefits from fast index creation with the > same restrictions as for ALTER TABLE. > This is a good comment, but a bit confusing. It should explicitly say somehow that item 1 is what this patch implements and items 2 and 3 are existing InnoDB features. Currently the comment creates an impression that all 1-3 are implemented in the patch. > > diff --git a/client/mysqldump.c b/client/mysqldump.c > index e4683ab..b8874e7 100644 > --- a/client/mysqldump.c > +++ b/client/mysqldump.c > @@ -84,12 +86,30 @@ > #define IGNORE_DATA 0x01 /* don't dump data for this table */ > #define IGNORE_INSERT_DELAYED 0x02 /* table doesn't support INSERT DELAYED */ > > +typedef enum { > + KEY_TYPE_NONE, > + KEY_TYPE_PRIMARY, > + KEY_TYPE_UNIQUE, > + KEY_TYPE_NON_UNIQUE, > + KEY_TYPE_FOREIGN > +} key_type_t; > + > /* Chars needed to store LONGLONG, excluding trailing '\0'. */ > #define LONGLONG_LEN 20 > > /* Max length GTID position that we will output. */ > #define MAX_GTID_LENGTH 1024 > > +/* Max length of identifier (columnname, keyname, tablename, etc). */ > +#define MAX_ID_LENGTH 65 Use SAFE_NAME_LEN instead, it's defined in mysql_com.h that mysqldump.c already includes > + > +/* Data structure for holding position information > +for simple keyword parser. */ > +typedef struct { > + char* m_start; > + char* m_pos; > +} simple_parser_t; > + > static void add_load_option(DYNAMIC_STRING *str, const char *option, > const char *option_value); > static ulong find_set(TYPELIB *lib, const char *x, uint length, > @@ -2843,6 +3296,9 @@ static uint get_table_structure(char *table, char *db, char *table_type, > > row= mysql_fetch_row(result); > > + if (opt_innodb_optimize_keys && !opt_comments && !strcmp(table_type, "InnoDB")) > + skip_secondary_keys(row[1], table); Okay, so opt_innodb_optimize_keys needs !opt_comments. Please, add a check, like if (opt_innodb_optimize_keys && opt_comments) { fprintf(stderr, "%s: You can't use --innodb-optimize-keys and " "--comments at the same time.\n", my_progname_short); return(EX_USAGE); } a good place for a check like this is get_options() function. > + > is_log_table= general_log_or_slow_log_tables(db, table); > if (is_log_table) > row[1]+= 13; /* strlen("CREATE TABLE ")= 13 */ The parser looked fine on the first glance, but I didn't review every single line of it. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 7206e6f: MDEV-8577: With enforce-storage-engine mysql_upgrade corrupts the schema:
by Sergei Golubchik 11 Sep '15

11 Sep '15

Hi, Jan! On Aug 08, Jan Lindström wrote: > MDEV-8577: With enforce-storage-engine mysql_upgrade corrupts the schema: > ALTER TABLE should either bypass enforce-storage-engine, or mysql_upgrade > should refuse to run > > Allow user to alter contents of existing table without enforcing > storage engine. However, enforce storage engine on ALTER TABLE x ENGINE=y; Good idea, I like this behavior. > diff --git a/sql/sql_table.cc b/sql/sql_table.cc > index 69c87dd..60c4407 100644 > --- a/sql/sql_table.cc > +++ b/sql/sql_table.cc > @@ -9801,8 +9801,12 @@ static bool check_engine(THD *thd, const char *db_name, > *new_engine= ha_checktype(thd, req_engine, no_substitution); > DBUG_ASSERT(*new_engine); > > - /* Enforced storage engine should not be used on bootstrap */ > - if (!in_bootstrap) > + /* Enforced storage engine should not be used on bootstrap > + and in ALTER TABLE that does not use explicit ENGINE = x to > + avoid unwanted unrelated changes.*/ > + if (!in_bootstrap && Note that !in_bootstrap belongs to another bug fix, please don't accidentally push it together with this one. > + !(thd->lex->sql_command == SQLCOM_ALTER_TABLE && > + !(create_info->used_fields & HA_CREATE_USED_ENGINE))) > enf_engine= thd->variables.enforced_table_plugin ? > plugin_hton(thd->variables.enforced_table_plugin) : NULL; Looks good, ok to push! Regards, Sergei

1 0