mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
compilation fixes
sql/ha_federated.h: copy-paste fix sql/sql_parse.cc: after-merge fix
This commit is contained in:
parent
475cfa7e82
commit
2033175ad0
2 changed files with 3 additions and 3 deletions
|
@ -72,7 +72,7 @@ private:
|
|||
return errorcode otherwise
|
||||
*/
|
||||
uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row);
|
||||
bool ha_federated::create_where_from_key(String *to, KEY *key_info, const byte *key, uint key_length);
|
||||
bool create_where_from_key(String *to, KEY *key_info, const byte *key, uint key_length);
|
||||
|
||||
public:
|
||||
ha_federated(TABLE *table): handler(table),
|
||||
|
|
|
@ -5151,8 +5151,8 @@ void mysql_parse(THD *thd, char *inBuf, uint length)
|
|||
PROCESSLIST.
|
||||
Note that we don't need LOCK_thread_count to modify query_length.
|
||||
*/
|
||||
if (lex->found_colon &&
|
||||
(thd->query_length= (ulong)(lex->found_colon - thd->query)))
|
||||
if (lex->found_semicolon &&
|
||||
(thd->query_length= (ulong)(lex->found_semicolon - thd->query)))
|
||||
thd->query_length--;
|
||||
/* Actually execute the query */
|
||||
mysql_execute_command(thd);
|
||||
|
|
Loading…
Reference in a new issue