diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | mysql-test/r/not_embedded_server.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/ps_grant.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/not_embedded_server.test | 16 | ||||
| -rw-r--r-- | mysql-test/t/ps_grant.test | 9 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 2 |
6 files changed, 25 insertions, 13 deletions
diff --git a/.bzrignore b/.bzrignore index 093c9b2f2bc..7a10ce9db69 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1053,3 +1053,4 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl +ndb/tools/ndb_config diff --git a/mysql-test/r/not_embedded_server.result b/mysql-test/r/not_embedded_server.result new file mode 100644 index 00000000000..082ebe72ba4 --- /dev/null +++ b/mysql-test/r/not_embedded_server.result @@ -0,0 +1,5 @@ +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; diff --git a/mysql-test/r/ps_grant.result b/mysql-test/r/ps_grant.result index 249fb2fe40f..f883bef8591 100644 --- a/mysql-test/r/ps_grant.result +++ b/mysql-test/r/ps_grant.result @@ -54,6 +54,7 @@ my_col 4 execute s_t9 ; ERROR 42S02: Table 'mysqltest.t9' doesn't exist +deallocate prepare s_t9; revoke all privileges on mysqltest.t1 from second_user@localhost identified by 'looser' ; show grants for second_user@localhost ; @@ -75,7 +76,3 @@ commit ; show grants for second_user@localhost ; ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost' 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 diff --git a/mysql-test/t/not_embedded_server.test b/mysql-test/t/not_embedded_server.test new file mode 100644 index 00000000000..b3607107320 --- /dev/null +++ b/mysql-test/t/not_embedded_server.test @@ -0,0 +1,16 @@ +# +# 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; diff --git a/mysql-test/t/ps_grant.test b/mysql-test/t/ps_grant.test index d6448dd152a..082ae9d7610 100644 --- a/mysql-test/t/ps_grant.test +++ b/mysql-test/t/ps_grant.test @@ -1,7 +1,6 @@ # Can't test grants with embedded server -- source include/not_embedded.inc - let $type= 'MYISAM' ; ################ GRANT/REVOKE/DROP affecting a parallel session ################ @@ -80,6 +79,7 @@ execute s_t1 ; ######## Question 2: The table t9 does not exist. ######## --error 1146 execute s_t9 ; +deallocate prepare s_t9; #### revoke the access rights to t1 @@ -111,10 +111,3 @@ commit ; show grants for second_user@localhost ; 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; - - 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); |