[Resend] bzr commit into mysql-trunk branch (guilhem.bichot:3298)

[Guilhem Bichot]

[This commit e-mail is a repeat.]

#At file:///home/mysql_src/bzrrepos_new/mysql-next-mr-opt-backporting-wl4800/ based on
revid:tor.didriksen@stripped

 3298 Guilhem Bichot	2011-05-05
      fix for pb2: test cannot run in embedded

    modified:
      mysql-test/include/optimizer_trace_security.inc
=== modified file 'mysql-test/include/optimizer_trace_security.inc'
--- a/mysql-test/include/optimizer_trace_security.inc	2011-05-04 20:53:28 +0000
+++ b/mysql-test/include/optimizer_trace_security.inc	2011-05-05 11:36:31 +0000
@@ -2,6 +2,8 @@
 # by lack of privileges.
 
 --source include/have_optimizer_trace.inc
+# Grant tests not performed with embedded server
+-- source include/not_embedded.inc
 
 connection default;
 let $DEFAULT_TRACE_MEM_SIZE=1048576; # 1MB


Attachment: [text/bzr-bundle] bzr/[e-mail]