diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-30 00:33:06 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-30 00:33:06 +0400 |
| commit | 85ed11c60d569a54a32cce1588594ee18c43e40a (patch) | |
| tree | a2457e79f43173dfb97236266c5bb7a47fdbf65f /mysql-test/r/loaddata.result | |
| parent | 21b8741b57204f784633c6337f9abacaa59ff3e2 (diff) | |
| parent | 2303a8c6e4dd94eb6b682c61e0ff333c21b188b2 (diff) | |
| download | mariadb-git-85ed11c60d569a54a32cce1588594ee18c43e40a.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in configure.in
Text conflict in dbug/dbug.c
Text conflict in mysql-test/r/ps.result
Text conflict in mysql-test/t/ps.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/ha_ndbcluster.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_table.cc
Diffstat (limited to 'mysql-test/r/loaddata.result')
| -rw-r--r--[-rwxr-xr-x] | mysql-test/r/loaddata.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index c07bf8ee4dd..9969147a93e 100755..100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -204,10 +204,10 @@ a b c 15 NULL Fifteen show variables like "secure_file_pri%"; Variable_name Value -secure_file_priv MYSQLTEST_VARDIR/ +secure_file_priv MYSQLTEST_VARDIR select @@secure_file_priv; @@secure_file_priv -MYSQLTEST_VARDIR/ +MYSQLTEST_VARDIR set @@secure_file_priv= 0; ERROR HY000: Variable 'secure_file_priv' is a read only variable truncate table t1; |