mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint

Browse source 
into  mysql.com:/home/ram/work/b31349/b31349.5.0
This commit is contained in:
ramil/ram@ramil.myoffice.izhnet.ru 2007-10-23 15:14:58 +05:00
commit dbadc0e2cc
3 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mysql-test/r/insert.result
View file

@ -461,4 +461,18 @@ i
2
2
DROP TABLE t1, t2;
CREATE TABLE t1 (c1 INT NOT NULL);
INSERT INTO t1 VALUES(4188.32999999999992724042385816574096679687500),
('4188.32999999999992724042385816574096679687500'), (4188);
SELECT * FROM t1;
c1
4188
4188
4188
CREATE TABLE t2 (c1 BIGINT);
INSERT INTO t2 VALUES('15449237462.0000000000');
SELECT * FROM t2;
c1
15449237462
DROP TABLE t1, t2;
End of 5.0 tests.

15
mysql-test/t/insert.test
View file

@ -353,5 +353,20 @@ SELECT * FROM t2;
DROP TABLE t1, t2;
#
# Bug #30453: String not cast to int correctly
#
CREATE TABLE t1 (c1 INT NOT NULL);
INSERT INTO t1 VALUES(4188.32999999999992724042385816574096679687500),
('4188.32999999999992724042385816574096679687500'), (4188);
SELECT * FROM t1;
CREATE TABLE t2 (c1 BIGINT);
INSERT INTO t2 VALUES('15449237462.0000000000');
SELECT * FROM t2;
DROP TABLE t1, t2;
--echo End of 5.0 tests.

14
strings/ctype-simple.c
View file

@ -1538,14 +1538,18 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs __attribute__((unused)),
}
else
addon= (*str >= '5');
for ( ; str < end && (ch= (unsigned char) (*str - '0')) < 10; str++)
if (!dot)
{
if (!dot)
shift++;
for ( ; str < end && (ch= (unsigned char) (*str - '0')) < 10; shift++, str++);
if (str < end && *str == '.')
{
str++;
for ( ; str < end && (ch= (unsigned char) (*str - '0')) < 10; str++);
}
}
if (str < end && *str == '.' && !dot)
else
{
str++;
shift= dot - str;
for ( ; str < end && (ch= (unsigned char) (*str - '0')) < 10; str++);
}
goto exp;