diff options
| author | unknown <jimw@mysql.com> | 2005-04-01 16:43:35 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-01 16:43:35 -0800 |
| commit | dd882cfb640d924459d1c8a84fe0fb1f7741f549 (patch) | |
| tree | 2375dec2cc48d78c721a7cdfe8ceb3fc7f6474e3 /mysql-test/t/grant2.test | |
| parent | 0ac7d26b74353ac075b67ba63182c6dd5364000b (diff) | |
| parent | 3b82560b959def5b5dfc1f6d5b9fee061890664f (diff) | |
| download | mariadb-git-dd882cfb640d924459d1c8a84fe0fb1f7741f549.tar.gz | |
Merge embedded-server testing changes.
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Merge changes
mysql-test/t/ps_1general.test:
Merge changes
Diffstat (limited to 'mysql-test/t/grant2.test')
| -rw-r--r-- | mysql-test/t/grant2.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test index b00bbd56b5c..362efc1230d 100644 --- a/mysql-test/t/grant2.test +++ b/mysql-test/t/grant2.test @@ -1,3 +1,6 @@ +# Grant tests not performed with embedded server +-- source include/not_embedded.inc + SET NAMES binary; # |