Below is the list of changes that have just been committed into a local
6.0 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-12-21 20:24:53+01:00, serg@stripped +7 -0
updating test results for new dtoa
BitKeeper/etc/ignore@stripped, 2007-12-21 20:24:49+01:00, serg@stripped +2 -0
Added libmysqld/des_key_file.cc libmysqld/sql_profile.cc to the ignore list
mysql-test/suite/falcon/r/falcon_bug_22125.result@stripped, 2007-12-21 20:24:48+01:00, serg@stripped +8 -8
updating test results for new dtoa
mysql-test/suite/ndb/r/ndb_alter_table_backup.result@stripped, 2007-12-21 20:24:48+01:00, serg@stripped +8 -8
updating test results for new dtoa
mysql-test/suite/ndb/r/ndb_alter_table_online.result@stripped, 2007-12-21 20:24:48+01:00, serg@stripped +4 -4
updating test results for new dtoa
mysql-test/suite/parts/r/partition_float_innodb.result@stripped, 2007-12-21 20:24:48+01:00, serg@stripped +25 -25
updating test results for new dtoa
mysql-test/suite/parts/r/partition_float_myisam.result@stripped, 2007-12-21 20:24:48+01:00, serg@stripped +25 -25
updating test results for new dtoa
mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result@stripped, 2007-12-21 20:24:48+01:00, serg@stripped +30 -30
updating test results for new dtoa
diff -Nrup a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
--- a/BitKeeper/etc/ignore 2007-12-18 18:54:47 +01:00
+++ b/BitKeeper/etc/ignore 2007-12-21 20:24:49 +01:00
@@ -3025,3 +3025,5 @@ win/vs8cache.txt
ylwrap
zlib/*.ds?
zlib/*.vcproj
+libmysqld/des_key_file.cc
+libmysqld/sql_profile.cc
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22125.result b/mysql-test/suite/falcon/r/falcon_bug_22125.result
--- a/mysql-test/suite/falcon/r/falcon_bug_22125.result 2007-10-26 07:15:00 +02:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_22125.result 2007-12-21 20:24:48 +01:00
@@ -26,16 +26,16 @@ UPDATE t1 SET f3 = -f3 WHERE f2 = '-nan'
CREATE INDEX it1 on t1 (f1);
SELECT * FROM t1 ORDER BY f1,f2,f3,f4;
f1 f2 f3 f4
--1.79769313486232e+308 -inf 0 -6
--1.79769313486232e+308 -max 0 -3
--1.79769313486232e+308 -nan 0 -5
--5.562684646268e-309 -min 0 -4
+-1.7976931348623157e308 -inf 0 -6
+-1.7976931348623157e308 -max 0 -3
+-1.7976931348623157e308 -nan 0 -5
+-5.562684646268003e-309 -min 0 -4
0 -zero 0 -1
0 zero 0 1
-5.562684646268e-309 min 0 4
-1.79769313486232e+308 inf 0 6
-1.79769313486232e+308 max 0 3
-1.79769313486232e+308 nan 0 5
+5.562684646268003e-309 min 0 4
+1.7976931348623157e308 inf 0 6
+1.7976931348623157e308 max 0 3
+1.7976931348623157e308 nan 0 5
SELECT count(*) FROM t1 where f1 = 0;
count(*)
2
diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table_backup.result b/mysql-test/suite/ndb/r/ndb_alter_table_backup.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table_backup.result 2007-11-20 16:24:20 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_backup.result 2007-12-21 20:24:48 +01:00
@@ -20,10 +20,10 @@ t1 CREATE TABLE `t1` (
) ENGINE=ndbcluster DEFAULT CHARSET=latin1
SELECT * FROM t1 WHERE a = 1 or a = 10 or a = 20 or a = 30 ORDER BY a;
a b c d e f g
-1 5 3.40282e+38 1.2686868689898e+308 666.66 2007-10-23 23:23:23 1111
-10 1 -3.40282e+38 NULL NULL NULL NULL
-20 1 -3.40282e+38 1.7976931348623e+308 345.21 NULL NULL
-30 1 -3.40282e+38 1.7976931348623e+308 345.21 1000-01-01 00:00:00 0101
+1 5 3.40282e38 1.2686868689898e308 666.66 2007-10-23 23:23:23 1111
+10 1 -3.40282e38 NULL NULL NULL NULL
+20 1 -3.40282e38 1.7976931348623e308 345.21 NULL NULL
+30 1 -3.40282e38 1.7976931348623e308 345.21 1000-01-01 00:00:00 0101
DROP TABLE t1;
*********************************
* restore tables w/ new column from big endian
@@ -45,8 +45,8 @@ t1 CREATE TABLE `t1` (
) ENGINE=ndbcluster DEFAULT CHARSET=latin1
SELECT * FROM t1 WHERE a = 1 or a = 10 or a = 20 or a = 30 ORDER BY a;
a b c d e f g
-1 5 3.40282e+38 1.2686868689898e+308 666.66 2007-10-23 23:23:23 1111
-10 1 -3.40282e+38 NULL NULL NULL NULL
-20 1 -3.40282e+38 1.7976931348623e+308 345.21 NULL NULL
-30 1 -3.40282e+38 1.7976931348623e+308 345.21 1000-01-01 00:00:00 0101
+1 5 3.40282e38 1.2686868689898e308 666.66 2007-10-23 23:23:23 1111
+10 1 -3.40282e38 NULL NULL NULL NULL
+20 1 -3.40282e38 1.7976931348623e308 345.21 NULL NULL
+30 1 -3.40282e38 1.7976931348623e308 345.21 1000-01-01 00:00:00 0101
DROP TABLE t1;
diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table_online.result b/mysql-test/suite/ndb/r/ndb_alter_table_online.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table_online.result 2007-11-28 09:05:11 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result 2007-12-21 20:24:48 +01:00
@@ -548,10 +548,10 @@ COUNT(*)
UPDATE t1 SET c = 3.402823466E+38, d = 1.2686868689898E+308, e = 666.66, f = '2007-10-23 23:23:23', g = '1111' WHERE a = 1;
SELECT * FROM t1 WHERE a = 1 or a = 10 or a = 20 or a = 30 ORDER BY a;
a b c d e f g
-1 5 3.40282e+38 1.2686868689898e+308 666.66 2007-10-23 23:23:23 1111
-10 1 -3.40282e+38 NULL NULL NULL NULL
-20 1 -3.40282e+38 1.7976931348623e+308 345.21 NULL NULL
-30 1 -3.40282e+38 1.7976931348623e+308 345.21 1000-01-01 00:00:00 0101
+1 5 3.40282e38 1.2686868689898e308 666.66 2007-10-23 23:23:23 1111
+10 1 -3.40282e38 NULL NULL NULL NULL
+20 1 -3.40282e38 1.7976931348623e308 345.21 NULL NULL
+30 1 -3.40282e38 1.7976931348623e308 345.21 1000-01-01 00:00:00 0101
*********************************
* Backup and restore tables w/ new column
*********************************
diff -Nrup a/mysql-test/suite/parts/r/partition_float_innodb.result b/mysql-test/suite/parts/r/partition_float_innodb.result
--- a/mysql-test/suite/parts/r/partition_float_innodb.result 2007-11-20 16:04:04 +01:00
+++ b/mysql-test/suite/parts/r/partition_float_innodb.result 2007-12-21 20:24:48 +01:00
@@ -21,25 +21,25 @@ t1 CREATE TABLE `t1` (
insert into t1 values (-3.402823466E+38), (3.402823466E+38), (-1.5), (-1), (0), (1), (1.5);
select * from t1;
a
--3.40282e+38
+-3.40282e38
-1.5
-1
0
1
1.5
-3.40282e+38
+3.40282e38
select * from t1 where a=1.5;
a
1.5
delete from t1 where a=1.5;
select * from t1;
a
--3.40282e+38
+-3.40282e38
-1.5
-1
0
1
-3.40282e+38
+3.40282e38
drop table t1;
create table t2 (a float not null, primary key(a)) engine='InnoDB'
partition by key (a) partitions 10;
@@ -52,37 +52,37 @@ t2 CREATE TABLE `t2` (
insert into t2 values (-3.402823466E+38), (-3.402823466E+37), (-123.456), (0), (1234546.789), (123.456), (1.5);
select * from t2;
a
--3.40282e+38
--3.40282e+37
+-3.40282e38
+-3.40282e37
-123.456
0
1.5
123.456
-1.23455e+06
+1234550
select * from t2 where a=123.456;
a
delete from t2 where a=123.456;
select * from t2;
a
--3.40282e+38
--3.40282e+37
+-3.40282e38
+-3.40282e37
-123.456
0
1.5
123.456
-1.23455e+06
+1234550
select * from t2 where a=1.5;
a
1.5
delete from t2 where a=1.5;
select * from t2;
a
--3.40282e+38
--3.40282e+37
+-3.40282e38
+-3.40282e37
-123.456
0
123.456
-1.23455e+06
+1234550
delete from t2;
1024*3 inserts;
select count(*) from t2;
@@ -112,27 +112,27 @@ t1 CREATE TABLE `t1` (
insert into t1 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208);
select * from t1;
a
--2.2250738585072e+208
+-2.2250738585072016e208
-1.5
-1
--2.2250738585072e-208
+-2.2250738585072014e-208
0
1.5
1234.567
-2.2250738585072e+208
+2.2250738585072016e208
select * from t1 where a=1.5;
a
1.5
delete from t1 where a=1.5;
select * from t1;
a
--2.2250738585072e+208
+-2.2250738585072016e208
-1.5
-1
--2.2250738585072e-208
+-2.2250738585072014e-208
0
1234.567
-2.2250738585072e+208
+2.2250738585072016e208
drop table t1;
create table t2 (a double not null, primary key(a)) engine='InnoDB'
partition by key (a) partitions 10;
@@ -145,27 +145,27 @@ t2 CREATE TABLE `t2` (
insert into t2 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208);
select * from t2;
a
--2.2250738585072e+208
+-2.2250738585072016e208
-1.5
-1
--2.2250738585072e-208
+-2.2250738585072014e-208
0
1.5
1234.567
-2.2250738585072e+208
+2.2250738585072016e208
select * from t2 where a=1234.567;
a
1234.567
delete from t2 where a=1234.567;
select * from t2;
a
--2.2250738585072e+208
+-2.2250738585072016e208
-1.5
-1
--2.2250738585072e-208
+-2.2250738585072014e-208
0
1.5
-2.2250738585072e+208
+2.2250738585072016e208
delete from t2;
1024*3 inserts;
select count(*) from t2;
diff -Nrup a/mysql-test/suite/parts/r/partition_float_myisam.result b/mysql-test/suite/parts/r/partition_float_myisam.result
--- a/mysql-test/suite/parts/r/partition_float_myisam.result 2007-11-20 16:04:04 +01:00
+++ b/mysql-test/suite/parts/r/partition_float_myisam.result 2007-12-21 20:24:48 +01:00
@@ -21,25 +21,25 @@ t1 CREATE TABLE `t1` (
insert into t1 values (-3.402823466E+38), (3.402823466E+38), (-1.5), (-1), (0), (1), (1.5);
select * from t1;
a
--3.40282e+38
+-3.40282e38
-1.5
-1
0
1
1.5
-3.40282e+38
+3.40282e38
select * from t1 where a=1.5;
a
1.5
delete from t1 where a=1.5;
select * from t1;
a
--3.40282e+38
+-3.40282e38
-1.5
-1
0
1
-3.40282e+38
+3.40282e38
drop table t1;
create table t2 (a float not null, primary key(a)) engine='MYISAM'
partition by key (a) partitions 10;
@@ -52,37 +52,37 @@ t2 CREATE TABLE `t2` (
insert into t2 values (-3.402823466E+38), (-3.402823466E+37), (-123.456), (0), (1234546.789), (123.456), (1.5);
select * from t2;
a
--3.40282e+38
--3.40282e+37
+-3.40282e38
+-3.40282e37
-123.456
0
1.5
123.456
-1.23455e+06
+1234550
select * from t2 where a=123.456;
a
delete from t2 where a=123.456;
select * from t2;
a
--3.40282e+38
--3.40282e+37
+-3.40282e38
+-3.40282e37
-123.456
0
1.5
123.456
-1.23455e+06
+1234550
select * from t2 where a=1.5;
a
1.5
delete from t2 where a=1.5;
select * from t2;
a
--3.40282e+38
--3.40282e+37
+-3.40282e38
+-3.40282e37
-123.456
0
123.456
-1.23455e+06
+1234550
delete from t2;
16384*3 inserts;
select count(*) from t2;
@@ -112,27 +112,27 @@ t1 CREATE TABLE `t1` (
insert into t1 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208);
select * from t1;
a
--2.2250738585072e+208
+-2.2250738585072016e208
-1.5
-1
--2.2250738585072e-208
+-2.2250738585072014e-208
0
1.5
1234.567
-2.2250738585072e+208
+2.2250738585072016e208
select * from t1 where a=1.5;
a
1.5
delete from t1 where a=1.5;
select * from t1;
a
--2.2250738585072e+208
+-2.2250738585072016e208
-1.5
-1
--2.2250738585072e-208
+-2.2250738585072014e-208
0
1234.567
-2.2250738585072e+208
+2.2250738585072016e208
drop table t1;
create table t2 (a double not null, primary key(a)) engine='MYISAM'
partition by key (a) partitions 10;
@@ -145,27 +145,27 @@ t2 CREATE TABLE `t2` (
insert into t2 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208);
select * from t2;
a
--2.2250738585072e+208
+-2.2250738585072016e208
-1.5
-1
--2.2250738585072e-208
+-2.2250738585072014e-208
0
1.5
1234.567
-2.2250738585072e+208
+2.2250738585072016e208
select * from t2 where a=1234.567;
a
1234.567
delete from t2 where a=1234.567;
select * from t2;
a
--2.2250738585072e+208
+-2.2250738585072016e208
-1.5
-1
--2.2250738585072e-208
+-2.2250738585072014e-208
0
1.5
-2.2250738585072e+208
+2.2250738585072016e208
delete from t2;
16384*3 inserts;
select count(*) from t2;
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result 2007-11-05 10:30:17 +01:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result 2007-12-21 20:24:48 +01:00
@@ -51,10 +51,10 @@ c1 c2 c d f g h
7 7 NULL NULL NULL NULL NULL
8 8 NULL NULL NULL NULL NULL
11 1 a NULL NULL NULL NULL
-12 2 b -3.40282e+38 NULL NULL NULL
-14 4 d -3.40282e+38 456.78 NULL NULL
-15 5 e -3.40282e+38 456.78 2007-10-26 12:00:00 NULL
-16 6 f -3.40282e+38 456.78 2007-10-26 12:00:00 abcd
+12 2 b -3.40282e38 NULL NULL NULL
+14 4 d -3.40282e38 456.78 NULL NULL
+15 5 e -3.40282e38 456.78 2007-10-26 12:00:00 NULL
+16 6 f -3.40282e38 456.78 2007-10-26 12:00:00 abcd
**********************
"Slave data"
**********************
@@ -67,43 +67,43 @@ c1 c2 c d f g h
7 7 NULL NULL NULL NULL NULL
8 8 NULL NULL NULL NULL NULL
11 1 a NULL NULL NULL NULL
-12 2 b -3.40282e+38 NULL NULL NULL
-14 4 d -3.40282e+38 456.78 NULL NULL
-15 5 e -3.40282e+38 456.78 2007-10-26 12:00:00 NULL
-16 6 f -3.40282e+38 456.78 2007-10-26 12:00:00 abcd
+12 2 b -3.40282e38 NULL NULL NULL
+14 4 d -3.40282e38 456.78 NULL NULL
+15 5 e -3.40282e38 456.78 2007-10-26 12:00:00 NULL
+16 6 f -3.40282e38 456.78 2007-10-26 12:00:00 abcd
UPDATE t1 SET c = "abcdef", d = 3.402823466E+38, f = 987.65, g = '2007-10-22 22:22:22', h = "aaaa";
***************************
"Master Data After Update"
***************************
SELECT * FROM t1 ORDER BY c1;
c1 c2 c d f g h
-1 NULL abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-2 NULL abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-3 NULL abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-6 6 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-7 7 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-8 8 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-11 1 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-12 2 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-14 4 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-15 5 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-16 6 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
+1 NULL abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+2 NULL abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+3 NULL abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+6 6 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+7 7 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+8 8 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+11 1 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+12 2 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+14 4 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+15 5 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+16 6 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
*************************
"Slave Data After Update"
*************************
SELECT * FROM t1 ORDER BY c1;
c1 c2 c d f g h
-1 NULL abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-2 NULL abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-3 NULL abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-6 6 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-7 7 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-8 8 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-11 1 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-12 2 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-14 4 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-15 5 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
-16 6 abcdef 3.40282e+38 987.65 2007-10-22 22:22:22 aaaa
+1 NULL abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+2 NULL abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+3 NULL abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+6 6 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+7 7 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+8 8 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+11 1 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+12 2 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+14 4 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+15 5 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
+16 6 abcdef 3.40282e38 987.65 2007-10-22 22:22:22 aaaa
DROP TABLE t1;
*************************************************
* Insert And Update New Added Columns With Commit
| Thread |
|---|
| • bk commit into 6.0 tree (serg:1.2503) | Sergei Golubchik | 21 Dec |
