summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-07-27 13:45:06 +0300
committerunknown <monty@mysql.com>2005-07-27 13:45:06 +0300
commit53f40f95f8fa48bec147d50f2cfe620a6ba49073 (patch)
treea15ad68654ef7b2beb74a7b30aa15162e29412a2 /sql
parentd70aead730c1043ddcee0a8cd8a1f5dffafaf402 (diff)
downloadmariadb-git-53f40f95f8fa48bec147d50f2cfe620a6ba49073.tar.gz
Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected
mysql-test/r/ps_grant.result: Deallocate prepare statements Moved test for 'show full processlist' to not_embedded_server.test becasue it's shouldn't be here and it could fail on a slow computer where previous connections has not yet disconnected mysql-test/t/ps_grant.test: Deallocate prepare statements Moved test for 'show full processlist' to not_embedded_server.test becasue it's shouldn't be here and it could fail on a slow computer where previous connections has not yet disconnected sql/sql_lex.cc: Fixed typo mysql-test/r/not_embedded_server.result: New BitKeeper file ``mysql-test/r/not_embedded_server.result'' mysql-test/t/not_embedded_server.test: New BitKeeper file ``mysql-test/t/not_embedded_server.test'' BitKeeper/etc/ignore: added ndb/tools/ndb_config
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_lex.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 42e3b678c09..8636b6542fc 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -561,7 +561,7 @@ int yylex(void *arg, void *yythd)
grammatically correct.
*/
else if (c == '?' && ((THD*) yythd)->command == COM_PREPARE &&
- !ident_map[cs, yyPeek()])
+ !ident_map[yyPeek()])
return(PARAM_MARKER);
return((int) c);