database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

compilation fixes

Browse Source 
sql/ha_federated.h:
  copy-paste fix
sql/sql_parse.cc:
  after-merge fix
This commit is contained in:
unknown
2005-02-18 14:42:14 +01:00
parent 475cfa7e82
commit 2033175ad0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/ha_federated.h
View File

@ -72,7 +72,7 @@ private:
return errorcode otherwise return errorcode otherwise
*/ */
uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row); 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: public:
ha_federated(TABLE *table): handler(table), ha_federated(TABLE *table): handler(table),

4
sql/sql_parse.cc
View File

@ -5151,8 +5151,8 @@ void mysql_parse(THD *thd, char *inBuf, uint length)
PROCESSLIST. PROCESSLIST.
Note that we don't need LOCK_thread_count to modify query_length. Note that we don't need LOCK_thread_count to modify query_length.
*/ */
if (lex->found_colon && if (lex->found_semicolon &&
(thd->query_length= (ulong)(lex->found_colon - thd->query))) (thd->query_length= (ulong)(lex->found_semicolon - thd->query)))
thd->query_length--; thd->query_length--;
/* Actually execute the query */ /* Actually execute the query */
mysql_execute_command(thd); mysql_execute_command(thd);