diff options
| author | tsmith@quadxeon.mysql.com <> | 2007-03-07 23:55:25 +0100 |
|---|---|---|
| committer | tsmith@quadxeon.mysql.com <> | 2007-03-07 23:55:25 +0100 |
| commit | c06499b210551683ec0b10064e5619a81b1c33e5 (patch) | |
| tree | e72037d23442a14def78a943ebb05c24b28beca4 /sql/mysqld.cc | |
| parent | 4656023eec84238806992eec3dbac4c4bc33298c (diff) | |
| parent | b89b192201e2262a846deb94a3f0a409c928b3cc (diff) | |
| download | mariadb-git-c06499b210551683ec0b10064e5619a81b1c33e5.tar.gz | |
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
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 76d0001a951..6180ccbd0c1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1600,18 +1600,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 /* |