summaryrefslogtreecommitdiff
path: root/mysql-test/t/grant2.test
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-03-03 17:44:28 -0800
committerunknown <jimw@mysql.com>2005-03-03 17:44:28 -0800
commitaec0408ba9634bc15be77b8507ca8b83ff609e24 (patch)
treefc99a10cad70dea095d3413a60f6502a37297961 /mysql-test/t/grant2.test
parentdaaeeedb499cd27ff0279d8321808cdbccdd7e09 (diff)
downloadmariadb-git-aec0408ba9634bc15be77b8507ca8b83ff609e24.tar.gz
Clean up merge of fix for Bug #3309.
mysql-test/r/grant2.result: Update results mysql-test/t/grant2.test: Reset sql_mode before test. sql/sql_acl.cc: Fixes to merge
Diffstat (limited to 'mysql-test/t/grant2.test')
-rw-r--r--mysql-test/t/grant2.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index 7e2ac5b4008..3b1200f8a6e 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -247,6 +247,7 @@ drop user mysqltest_B@'%';
drop user mysqltest_3@localhost;
#
# Bug #3309: Test IP addresses with netmask
+set @@sql_mode='';
create database mysqltest_1;
create table mysqltest_1.t1 (i int);
insert into mysqltest_1.t1 values (1),(2),(3);