diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-08-24 20:18:39 +0500 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-08-24 20:18:39 +0500 |
| commit | 4c55e2ac4b737db533094c460882917bfb2aadd6 (patch) | |
| tree | 80ed4dd4e49cf529da5825d7ef1f563e263305eb /mysql-test | |
| parent | d7dd19aa07c3ba439c2b97d50949f2142cefb203 (diff) | |
| parent | 84648dfbdd96d1c56f5e79c3b5b3bc195567e226 (diff) | |
| download | mariadb-git-4c55e2ac4b737db533094c460882917bfb2aadd6.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
sql-common/client.c:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysql_protocols.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/mysql_protocols.test | 10 |
2 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/mysql_protocols.result b/mysql-test/r/mysql_protocols.result new file mode 100644 index 00000000000..272e3bda6f0 --- /dev/null +++ b/mysql-test/r/mysql_protocols.result @@ -0,0 +1,9 @@ +<default> + ok +TCP + ok +SOCKET + ok +ERROR 2047: Wrong or unknown protocol +ERROR 2047: Wrong or unknown protocol +Unknown option to protocol: NullS diff --git a/mysql-test/t/mysql_protocols.test b/mysql-test/t/mysql_protocols.test new file mode 100644 index 00000000000..942ba2722d8 --- /dev/null +++ b/mysql-test/t/mysql_protocols.test @@ -0,0 +1,10 @@ + +# test for Bug #4998 "--protocol doesn't reject bad values" + +--exec echo "select ' ok' as '<default>'" | $MYSQL +--exec echo "select ' ok' as 'TCP'" | $MYSQL --protocol=TCP +--exec echo "select ' ok' as 'SOCKET'" | $MYSQL --protocol=SOCKET +--exec echo "select ' ok' as 'PIPE'" | $MYSQL --protocol=PIPE 2>&1 +--exec echo "select ' ok' as 'MEMORY'" | $MYSQL --protocol=MEMORY 2>&1 +--exec echo "select ' ok' as 'NullS'" | $MYSQL --protocol=NullS 2>&1 + |