diff options
| author | unknown <monty@tik.mysql.fi> | 2002-04-12 21:53:41 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2002-04-12 21:53:41 +0300 |
| commit | caf41c9e4375357fa03e0583cf675a39172078d8 (patch) | |
| tree | 664030bd5030d0d95b8b349724f949bf4abb462c /mysql-test | |
| parent | 87ece1faac8b21b701a3aa02171247d2f7e8d44c (diff) | |
| parent | 6326ec9944e8ab44fceff629d6681700573ab686 (diff) | |
| download | mariadb-git-caf41c9e4375357fa03e0583cf675a39172078d8.tar.gz | |
merge
client/mysql.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_misc.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 575f5e5429a..4eed80c4cc9 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -3,10 +3,10 @@ format(1.5555,0) format(123.5555,1) format(1234.5555,2) format(12345.5555,3) for 2 123.6 1,234.56 12,345.556 123,456.5555 1,234,567.55550 12,345.24 select inet_ntoa(inet_aton("255.255.255.255.255.255.255.255")); inet_ntoa(inet_aton("255.255.255.255.255.255.255.255")) -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 select inet_ntoa(1099511627775),inet_ntoa(4294902271),inet_ntoa(511); inet_ntoa(1099511627775) inet_ntoa(4294902271) inet_ntoa(511) -255.255.255.255.255 255.255.1.255 0.0.1.255 +NULL 255.255.1.255 0.0.1.255 |