diff options
| author | unknown <monty@donna.mysql.fi> | 2001-03-11 21:20:15 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-03-11 21:20:15 +0200 |
| commit | 97acb7b3d17dc60f6b879044aa53b7f422f553c2 (patch) | |
| tree | 3ffab1dce3f9b12f0d98de2289a2022d1e7f3327 /sql/sql_lex.cc | |
| parent | 74ea7333032ebc1d396f1939fd5a84c7a6ecc50c (diff) | |
| download | mariadb-git-97acb7b3d17dc60f6b879044aa53b7f422f553c2.tar.gz | |
Added new tests to benchmark suite
Docs/manual.texi:
Updated some typos in the innobase section
client/mysql.cc:
Added print of field types (for debugging)
client/mysqladmin.c:
Added timeout for shutdown
mysql-test/mysql-test-run.sh:
Use timeout for shutdown
sql-bench/test-select.sh:
Added test of query cache and new tests for count(distinct)
sql/ha_myisam.cc:
Don't give warnings for RESTORE TABLE
sql/mysqld.cc:
Added printing of innobase options
sql/sql_lex.cc:
Fixed possible bug when OEM
sql/sql_table.cc:
cleanup
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index ca36cb9f205..b8d2ee13b0e 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -250,7 +250,8 @@ static char *get_text(LEX *lex) str=lex->tok_start+1; end=lex->ptr-1; - start=(uchar*) sql_alloc((uint) (end-str)+1); + if (!(start=(uchar*) sql_alloc((uint) (end-str)+1))) + return (char*) ""; // Sql_alloc has set error flag if (!found_escape) { lex->yytoklen=(uint) (end-str); |