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

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

Browse source 
into narttu.mysql.fi:/my/mysql-4.0
This commit is contained in:
monty@narttu.mysql.fi 2003-07-03 15:13:22 +03:00
commit c4db78d8a6
6 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/r/func_misc.result
View file

@ -13,3 +13,6 @@ NULL 255.255.1.255 0.0.1.255
select length(format('nan', 2)) > 0;
length(format('nan', 2)) > 0
1
select concat("$",format(2500,2));
concat("$",format(2500,2))
$2,500.00

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

@ -5,3 +5,17 @@ SELECT s, id FROM t1 WHERE s = 'mouse';
s id
mouse 3
drop table t1;
CREATE TABLE t1 (
node int(11) NOT NULL default '0',
maxchild int(11) NOT NULL default '0',
PRIMARY KEY (`node`)
);
INSERT INTO t1 (node, maxchild) VALUES (4,4),(5,5),(1,244);
SELECT * FROM t1 g1, t1 g2
WHERE g1.node <= g2.node and g2.node <= g1.maxchild and g2.node = g2.maxchild;
node maxchild node maxchild
4 4 4 4
5 5 5 5
1 244 4 4
1 244 5 5
DROP TABLE t1;

5
mysql-test/t/func_misc.test
View file

@ -12,3 +12,8 @@ select inet_ntoa(1099511627775),inet_ntoa(4294902271),inet_ntoa(511);
# Test for core dump with nan
#
select length(format('nan', 2)) > 0;
#
# Test for bug #628
#
select concat("$",format(2500,2));

13
mysql-test/t/sel000001.test
View file

@ -16,3 +16,16 @@ CREATE TABLE t1 (s CHAR(20) PRIMARY KEY, id INT);
INSERT INTO t1 VALUES ('cat', 1), ('mouse', 3), ('dog', 2), ('snake', 77);
SELECT s, id FROM t1 WHERE s = 'mouse';
drop table t1;
#
#test for bug #717
#
CREATE TABLE t1 (
node int(11) NOT NULL default '0',
maxchild int(11) NOT NULL default '0',
PRIMARY KEY (`node`)
);
INSERT INTO t1 (node, maxchild) VALUES (4,4),(5,5),(1,244);
SELECT * FROM t1 g1, t1 g2
WHERE g1.node <= g2.node and g2.node <= g1.maxchild and g2.node = g2.maxchild;
DROP TABLE t1;

2
sql/item_strfunc.cc
View file

@ -1483,7 +1483,7 @@ String *Item_func_format::val_str(String *str)
str= copy_if_not_alloced(&tmp_str,str,length);
str->length(length);
tmp= (char*) str->ptr()+length - dec-1;
for (pos= (char*) str->ptr()+length ; pos != tmp; pos--)
for (pos= (char*) str->ptr()+length-1; pos != tmp; pos--)
pos[0]= pos[-(int) diff];
while (diff)
{

2
sql/sql_select.cc
View file

@ -2683,7 +2683,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
(select->quick &&
(select->quick->records >= 100L)))) ?
2 : 1;
sel->read_tables= used_tables;
sel->read_tables= used_tables & ~current_map;
}
if (i != join->const_tables && tab->use_quick != 2)
{ /* Read with cache */