Commit 53f40f95 authored by unknown's avatar unknown

Moved test for 'show full processlist' to not_embedded_server.test becasue it...

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
parent d70aead7
...@@ -1053,3 +1053,4 @@ vio/test-ssl ...@@ -1053,3 +1053,4 @@ vio/test-ssl
vio/test-sslclient vio/test-sslclient
vio/test-sslserver vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
ndb/tools/ndb_config
prepare stmt1 from ' show full processlist ';
execute stmt1;
Id User Host db Command Time State Info
number root localhost test Execute time NULL show full processlist
deallocate prepare stmt1;
...@@ -54,6 +54,7 @@ my_col ...@@ -54,6 +54,7 @@ my_col
4 4
execute s_t9 ; execute s_t9 ;
ERROR 42S02: Table 'mysqltest.t9' doesn't exist ERROR 42S02: Table 'mysqltest.t9' doesn't exist
deallocate prepare s_t9;
revoke all privileges on mysqltest.t1 from second_user@localhost revoke all privileges on mysqltest.t1 from second_user@localhost
identified by 'looser' ; identified by 'looser' ;
show grants for second_user@localhost ; show grants for second_user@localhost ;
...@@ -75,7 +76,3 @@ commit ; ...@@ -75,7 +76,3 @@ commit ;
show grants for second_user@localhost ; show grants for second_user@localhost ;
ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost' ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost'
drop database mysqltest; drop database mysqltest;
prepare stmt4 from ' show full processlist ';
execute stmt4;
Id User Host db Command Time State Info
number root localhost test Execute time NULL show full processlist
#
# Here we collect tests that doesn't work with the embedded server
#
-- source include/not_embedded.inc
#
# Show full process list with prepare
# To not show other connections, this must be the first test and we must
# have a server restart before this one
#
prepare stmt1 from ' show full processlist ';
--replace_column 1 number 6 time 3 localhost
execute stmt1;
deallocate prepare stmt1;
# Can't test grants with embedded server # Can't test grants with embedded server
-- source include/not_embedded.inc -- source include/not_embedded.inc
let $type= 'MYISAM' ; let $type= 'MYISAM' ;
################ GRANT/REVOKE/DROP affecting a parallel session ################ ################ GRANT/REVOKE/DROP affecting a parallel session ################
...@@ -80,6 +79,7 @@ execute s_t1 ; ...@@ -80,6 +79,7 @@ execute s_t1 ;
######## Question 2: The table t9 does not exist. ######## ######## Question 2: The table t9 does not exist. ########
--error 1146 --error 1146
execute s_t9 ; execute s_t9 ;
deallocate prepare s_t9;
#### revoke the access rights to t1 #### revoke the access rights to t1
...@@ -111,10 +111,3 @@ commit ; ...@@ -111,10 +111,3 @@ commit ;
show grants for second_user@localhost ; show grants for second_user@localhost ;
drop database mysqltest; drop database mysqltest;
# Tested here simply so it is not tested with embedded server
prepare stmt4 from ' show full processlist ';
--replace_column 1 number 6 time 3 localhost
execute stmt4;
...@@ -561,7 +561,7 @@ int yylex(void *arg, void *yythd) ...@@ -561,7 +561,7 @@ int yylex(void *arg, void *yythd)
grammatically correct. grammatically correct.
*/ */
else if (c == '?' && ((THD*) yythd)->command == COM_PREPARE && else if (c == '?' && ((THD*) yythd)->command == COM_PREPARE &&
!ident_map[cs, yyPeek()]) !ident_map[yyPeek()])
return(PARAM_MARKER); return(PARAM_MARKER);
return((int) c); return((int) c);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment