database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch

Browse Source 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge


mysql-test/lib/init_db.sql:
  Auto merged
mysql-test/r/1st.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
mysql-test/r/sp.result:
  WL# 3031
  
  More fun with error codes. These error codes vary in the result files because new error codes have been added
mysql-test/r/sp_gis.result:
  WL# 3031
  
  More fun with error codes. These error codes vary in the result files because new error codes have been added
This commit is contained in:
unknown
2006-12-08 22:30:18 -05:00
parent 9e82f299e5 715e63ae98
commit 00080b90f7
36 changed files with 13315 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
sql/sql_parse.cc
View File

@@ -5189,6 +5189,58 @@ create_sp_error:
#endif /* EMBEDDED_LIBRARY */
break;
}
case SQLCOM_CREATE_SERVER:
{
int error;
LEX *lex= thd->lex;
DBUG_PRINT("info", ("case SQLCOM_CREATE_SERVER"));
if ((error= create_server(thd, &lex->server_options)))
{
DBUG_PRINT("info", ("problem creating server",
lex->server_options.server_name));
my_error(error, MYF(0), lex->server_options.server_name);
break;
}
send_ok(thd, 1);
break;
}
case SQLCOM_ALTER_SERVER:
{
int error;
LEX *lex= thd->lex;
DBUG_PRINT("info", ("case SQLCOM_ALTER_SERVER"));
if ((error= alter_server(thd, &lex->server_options)))
{
DBUG_PRINT("info", ("problem altering server",
lex->server_options.server_name));
my_error(error, MYF(0), lex->server_options.server_name);
break;
}
send_ok(thd, 1);
break;
}
case SQLCOM_DROP_SERVER:
{
int err_code;
LEX *lex= thd->lex;
DBUG_PRINT("info", ("case SQLCOM_DROP_SERVER"));
if ((err_code= drop_server(thd, &lex->server_options)))
{
if (! lex->drop_if_exists && err_code == ER_FOREIGN_SERVER_EXISTS)
{
DBUG_PRINT("info", ("problem dropping server %s",
lex->server_options.server_name));
my_error(err_code, MYF(0), lex->server_options.server_name);
}
else
{
send_ok(thd, 0);
}
break;
}
send_ok(thd, 1);
break;
}
default:
#ifndef EMBEDDED_LIBRARY
DBUG_ASSERT(0); /* Impossible */