Commit 8aff7009 authored by unknown's avatar unknown

fix for #1211


sql/sql_parse.cc:
  Replication's commands were allowed, but didn't have proper implementations
  for embedded library
parent 2a5b413a
...@@ -1499,6 +1499,8 @@ mysql_execute_command(void) ...@@ -1499,6 +1499,8 @@ mysql_execute_command(void)
res = mysql_restore_table(thd, tables); res = mysql_restore_table(thd, tables);
break; break;
} }
#ifndef EMBEDDED_LIBRARY
case SQLCOM_CHANGE_MASTER: case SQLCOM_CHANGE_MASTER:
{ {
if (check_global_access(thd, SUPER_ACL)) if (check_global_access(thd, SUPER_ACL))
...@@ -1535,6 +1537,8 @@ mysql_execute_command(void) ...@@ -1535,6 +1537,8 @@ mysql_execute_command(void)
else else
res = load_master_data(thd); res = load_master_data(thd);
break; break;
#endif /*!EMBEDDED_LIBRARY*/
#ifdef HAVE_INNOBASE_DB #ifdef HAVE_INNOBASE_DB
case SQLCOM_SHOW_INNODB_STATUS: case SQLCOM_SHOW_INNODB_STATUS:
...@@ -1546,6 +1550,7 @@ mysql_execute_command(void) ...@@ -1546,6 +1550,7 @@ mysql_execute_command(void)
} }
#endif #endif
#ifndef EMBEDDED_LIBRARY
case SQLCOM_LOAD_MASTER_TABLE: case SQLCOM_LOAD_MASTER_TABLE:
{ {
if (!tables->db) if (!tables->db)
...@@ -1572,6 +1577,8 @@ mysql_execute_command(void) ...@@ -1572,6 +1577,8 @@ mysql_execute_command(void)
UNLOCK_ACTIVE_MI; UNLOCK_ACTIVE_MI;
break; break;
} }
#endif /*!EMBEDDED_LIBRARY*/
case SQLCOM_CREATE_TABLE: case SQLCOM_CREATE_TABLE:
{ {
ulong want_priv= ((lex->create_info.options & HA_LEX_CREATE_TMP_TABLE) ? ulong want_priv= ((lex->create_info.options & HA_LEX_CREATE_TMP_TABLE) ?
...@@ -1676,6 +1683,7 @@ mysql_execute_command(void) ...@@ -1676,6 +1683,7 @@ mysql_execute_command(void)
res = mysql_create_index(thd, tables, lex->key_list); res = mysql_create_index(thd, tables, lex->key_list);
break; break;
#ifndef EMBEDDED_LIBRARY
case SQLCOM_SLAVE_START: case SQLCOM_SLAVE_START:
{ {
LOCK_ACTIVE_MI; LOCK_ACTIVE_MI;
...@@ -1708,6 +1716,8 @@ mysql_execute_command(void) ...@@ -1708,6 +1716,8 @@ mysql_execute_command(void)
UNLOCK_ACTIVE_MI; UNLOCK_ACTIVE_MI;
break; break;
} }
#endif /*!EMBEDDED_LIBRARY*/
case SQLCOM_ALTER_TABLE: case SQLCOM_ALTER_TABLE:
#if defined(DONT_ALLOW_SHOW_COMMANDS) #if defined(DONT_ALLOW_SHOW_COMMANDS)
send_error(&thd->net,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */ send_error(&thd->net,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment