diff options
| author | kostja@bodhi.local <> | 2007-03-07 12:28:16 +0300 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2007-03-07 12:28:16 +0300 |
| commit | c2e0e5af096d183c0adb166ae11dd9039b2d145b (patch) | |
| tree | 1249811d57e93e6711457da61be9ec118f88343e /sql/mysqld.cc | |
| parent | 82c1c02379e4573a6699dec2f9c0180f81d6f166 (diff) | |
| parent | 86f02cd378aac2cdedf1650c2bcdf9ebe0bba239 (diff) | |
| download | mariadb-git-c2e0e5af096d183c0adb166ae11dd9039b2d145b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into bodhi.local:/opt/local/work/mysql-5.0-26750
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f8a5f7bf8b4..7b2c46f409e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1598,18 +1598,6 @@ static void network_init(void) #endif /*!EMBEDDED_LIBRARY*/ -void MYSQLerror(const char *s) -{ - THD *thd=current_thd; - char *yytext= (char*) thd->lex->tok_start; - /* "parse error" changed into "syntax error" between bison 1.75 and 1.875 */ - if (strcmp(s,"parse error") == 0 || strcmp(s,"syntax error") == 0) - s=ER(ER_SYNTAX_ERROR); - my_printf_error(ER_PARSE_ERROR, ER(ER_PARSE_ERROR), MYF(0), s, - (yytext ? (char*) yytext : ""), - thd->lex->yylineno); -} - #ifndef EMBEDDED_LIBRARY /* |