diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-01-20 00:32:25 +0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-01-20 00:32:25 +0400 |
| commit | 7db61ce021642bb3bbee1c341d94f3539037df80 (patch) | |
| tree | 9f7467f26608a50aa2d2fe9896d5eb28313b8810 /mysql-test/r/func_misc.result | |
| parent | a66924353a9fb4a1c1bfa05ad45aa3cabc34c3b6 (diff) | |
| download | mariadb-git-7db61ce021642bb3bbee1c341d94f3539037df80.tar.gz | |
Fixed bug #2310 "INET_ATON handles short-forms addresses incorrectly"
mysql-test/r/func_misc.result:
added new test for inet_aton (short-forms addresses)
mysql-test/t/func_misc.test:
added new test for inet_aton (short-forms addresses)
sql/item_func.cc:
Change Item_func_inet_aton::val_int to parse short-forms addresses correctly
Diffstat (limited to 'mysql-test/r/func_misc.result')
| -rw-r--r-- | mysql-test/r/func_misc.result | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index d51bea020ed..ec5f76409e7 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -6,10 +6,19 @@ inet_ntoa(inet_aton("255.255.255.255.255.255.255.255")) NULL select inet_aton("255.255.255.255.255"),inet_aton("255.255.1.255"),inet_aton("0.1.255"); inet_aton("255.255.255.255.255") inet_aton("255.255.1.255") inet_aton("0.1.255") -1099511627775 4294902271 511 +1099511627775 4294902271 65791 select inet_ntoa(1099511627775),inet_ntoa(4294902271),inet_ntoa(511); inet_ntoa(1099511627775) inet_ntoa(4294902271) inet_ntoa(511) NULL 255.255.1.255 0.0.1.255 +select hex(inet_aton('127')); +hex(inet_aton('127')) +7F +select hex(inet_aton('127.1')); +hex(inet_aton('127.1')) +7F000001 +select hex(inet_aton('127.1.1')); +hex(inet_aton('127.1.1')) +7F010001 select length(format('nan', 2)) > 0; length(format('nan', 2)) > 0 1 |