diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-07 20:17:55 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-07 20:17:55 +0400 |
| commit | 9a2f98198903de89ab08ce7906e4307fe5ad50a9 (patch) | |
| tree | 1cb84ff0f047fa8321330c5e4c52eca6424494de /mysql-test/r/loaddata.result | |
| parent | 480a4852a01088cdc8638934f13469b6bf54effe (diff) | |
| parent | 5b6ebdf086fe0506dc1d2cb70a95f9633fd7a782 (diff) | |
| download | mariadb-git-9a2f98198903de89ab08ce7906e4307fe5ad50a9.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/t/explain.test
Text conflict in sql/net_serv.cc
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_priv.h
Diffstat (limited to 'mysql-test/r/loaddata.result')
| -rw-r--r-- | mysql-test/r/loaddata.result | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index 9969147a93e..7a79603adb3 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -202,12 +202,6 @@ select * from t1; a b c 10 NULL Ten 15 NULL Fifteen -show variables like "secure_file_pri%"; -Variable_name Value -secure_file_priv MYSQLTEST_VARDIR -select @@secure_file_priv; -@@secure_file_priv -MYSQLTEST_VARDIR set @@secure_file_priv= 0; ERROR HY000: Variable 'secure_file_priv' is a read only variable truncate table t1; |