Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony 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, 2006-08-14 21:27:36-07:00, acurtis@stripped +15 -0
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into xiphis.org:/home/antony/work2/mysql-5.0-merge
MERGE: 1.2196.31.10
mysql-test/r/create.result@stripped, 2006-08-14 21:27:31-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.118.1.1
mysql-test/r/federated.result@stripped, 2006-08-14 21:27:31-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.36.1.1
mysql-test/r/insert_select.result@stripped, 2006-08-14 21:27:31-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.38.1.1
mysql-test/r/ps_2myisam.result@stripped, 2006-08-14 21:27:31-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.40.1.1
mysql-test/r/ps_3innodb.result@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.43.1.1
mysql-test/r/ps_4heap.result@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.39.1.1
mysql-test/r/ps_5merge.result@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.40.1.1
mysql-test/r/ps_6bdb.result@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.42.1.1
mysql-test/r/ps_7ndb.result@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.42.1.1
mysql-test/r/strict.result@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.27.1.1
mysql-test/r/view.result@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.162.1.1
mysql-test/r/warnings.result@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.35.2.1
sql/share/errmsg.txt@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.65.1.1
sql/sql_base.cc@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.344.1.1
sql/sql_insert.cc@stripped, 2006-08-14 21:27:32-07:00, acurtis@stripped +0 -0
Auto merged
MERGE: 1.194.1.4
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: acurtis
# Host: ltantony.xiphis.org
# Root: /home/antony/work2/mysql-5.0-merge/RESYNC
--- 1.66/sql/share/errmsg.txt 2006-08-14 21:27:47 -07:00
+++ 1.67/sql/share/errmsg.txt 2006-08-14 21:27:47 -07:00
@@ -4893,8 +4893,8 @@
ER_WARN_NULL_TO_NOTNULL 22004
- eng "Column set to default value; NULL supplied to NOT NULL column '%s' at row %ld"
+ eng "Column was set to data type implicit default; NULL supplied for NOT NULL column '%s' at row %ld"
por "Dado truncado, NULL fornecido para NOT NULL coluna '%s' na linha %ld"
ER_WARN_DATA_OUT_OF_RANGE 22003
--- 1.169/mysql-test/r/view.result 2006-08-14 21:27:47 -07:00
+++ 1.170/mysql-test/r/view.result 2006-08-14 21:27:47 -07:00
@@ -1495,7 +1495,7 @@
insert into v3(a) select a from t2;
insert into v3(b) select b from t2;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 2
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 2
insert into v3(a) values (1) on duplicate key update a=a+10000+VALUES(a);
select * from t1;
a b
--- 1.41/mysql-test/r/ps_2myisam.result 2006-08-14 21:27:47 -07:00
+++ 1.42/mysql-test/r/ps_2myisam.result 2006-08-14 21:27:47 -07:00
@@ -1304,7 +1304,7 @@
set @arg01=2;
execute stmt1 using @arg00, @arg01;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1
select a,b from t1 order by a;
a b
0 two
--- 1.44/mysql-test/r/ps_3innodb.result 2006-08-14 21:27:47 -07:00
+++ 1.45/mysql-test/r/ps_3innodb.result 2006-08-14 21:27:47 -07:00
@@ -1287,7 +1287,7 @@
set @arg01=2;
execute stmt1 using @arg00, @arg01;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1
select a,b from t1 order by a;
a b
0 two
--- 1.40/mysql-test/r/ps_4heap.result 2006-08-14 21:27:47 -07:00
+++ 1.41/mysql-test/r/ps_4heap.result 2006-08-14 21:27:47 -07:00
@@ -1288,7 +1288,7 @@
set @arg01=2;
execute stmt1 using @arg00, @arg01;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1
select a,b from t1 order by a;
a b
0 two
--- 1.41/mysql-test/r/ps_5merge.result 2006-08-14 21:27:47 -07:00
+++ 1.42/mysql-test/r/ps_5merge.result 2006-08-14 21:27:47 -07:00
@@ -1330,7 +1330,7 @@
set @arg01=2;
execute stmt1 using @arg00, @arg01;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1
select a,b from t1 order by a;
a b
0 two
@@ -4344,7 +4344,7 @@
set @arg01=2;
execute stmt1 using @arg00, @arg01;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1
select a,b from t1 order by a;
a b
0 two
--- 1.43/mysql-test/r/ps_6bdb.result 2006-08-14 21:27:47 -07:00
+++ 1.44/mysql-test/r/ps_6bdb.result 2006-08-14 21:27:47 -07:00
@@ -1287,7 +1287,7 @@
set @arg01=2;
execute stmt1 using @arg00, @arg01;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1
select a,b from t1 order by a;
a b
0 two
--- 1.44/mysql-test/r/ps_7ndb.result 2006-08-14 21:27:47 -07:00
+++ 1.45/mysql-test/r/ps_7ndb.result 2006-08-14 21:27:47 -07:00
@@ -1287,7 +1287,7 @@
set @arg01=2;
execute stmt1 using @arg00, @arg01;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1
select a,b from t1 order by a;
a b
0 two
--- 1.120/mysql-test/r/create.result 2006-08-14 21:27:47 -07:00
+++ 1.121/mysql-test/r/create.result 2006-08-14 21:27:47 -07:00
@@ -13,7 +13,7 @@
Note 1050 Table 't1' already exists
insert into t1 values (""),(null);
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'b' at row 2
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 2
select * from t1;
b
--- 1.39/mysql-test/r/insert_select.result 2006-08-14 21:27:47 -07:00
+++ 1.40/mysql-test/r/insert_select.result 2006-08-14 21:27:47 -07:00
@@ -606,8 +606,8 @@
create table t2(No int not null, Field int not null, Count int not null);
insert into t2 Select null, Field, Count From t1 Where Month=20030901 and Type=2;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'No' at row 1
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'No' at row 2
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'No' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'No' at row 2
select * from t2;
No Field Count
0 1 100
--- 1.28/mysql-test/r/strict.result 2006-08-14 21:27:47 -07:00
+++ 1.29/mysql-test/r/strict.result 2006-08-14 21:27:47 -07:00
@@ -997,16 +997,16 @@
INSERT INTO t1 VALUES (103,'',NULL);
ERROR 23000: Column 'col3' cannot be null
UPDATE t1 SET col1=NULL WHERE col1 =100;
-ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'col1' at row 1
+ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col1' at row 1
UPDATE t1 SET col2 =NULL WHERE col2 ='hello';
-ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'col2' at row 1
+ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1
UPDATE t1 SET col2 =NULL where col3 IS NOT NULL;
-ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'col2' at row 1
+ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1
INSERT IGNORE INTO t1 values (NULL,NULL,NULL);
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'col1' at row 1
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'col2' at row 1
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'col3' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'col1' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'col3' at row 1
SELECT * FROM t1;
col1 col2 col3
100 hello 2004-08-20
@@ -1031,11 +1031,11 @@
INSERT INTO t1 (col1) SELECT 1;
ERROR HY000: Field 'col2' doesn't have a default value
INSERT INTO t1 SELECT 1,NULL;
-ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'col2' at row 1
+ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1
INSERT IGNORE INTO t1 values (NULL,NULL);
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'col1' at row 1
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'col2' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'col1' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1
INSERT IGNORE INTO t1 (col1) values (3);
Warnings:
Warning 1364 Field 'col2' doesn't have a default value
--- 1.37/mysql-test/r/federated.result 2006-08-14 21:27:47 -07:00
+++ 1.38/mysql-test/r/federated.result 2006-08-14 21:27:47 -07:00
@@ -967,6 +967,8 @@
`blurb` text default '',
PRIMARY KEY (blurb_id))
DEFAULT CHARSET=latin1;
+Warnings:
+Warning 1101 BLOB/TEXT column 'blurb' can't have a default value
DROP TABLE IF EXISTS federated.t1;
CREATE TABLE federated.t1 (
`blurb_id` int NOT NULL DEFAULT 0,
@@ -975,6 +977,8 @@
ENGINE="FEDERATED"
DEFAULT CHARSET=latin1
CONNECTION='mysql://root@stripped:SLAVE_PORT/federated/t1';
+Warnings:
+Warning 1101 BLOB/TEXT column 'blurb' can't have a default value
INSERT INTO federated.t1 VALUES (1, " MySQL supports a number of column types in several categories: numeric types, date and time types, and string (character) types. This chapter first gives an overview of these column types, and then provides a more detailed description of the properties of the types in each category, and a summary of the column type storage requirements. The overview is intentionally brief. The more detailed descriptions should be consulted for additional information about particular column types, such as the allowable formats in which you can specify values.");
INSERT INTO federated.t1 VALUES (2, "All arithmetic is done using signed BIGINT or DOUBLE values, so you should not use unsigned big integers larger than 9223372036854775807 (63 bits) except with bit functions! If you do that, some of the last digits in the result may be wrong because of rounding errors when converting a BIGINT value to a DOUBLE.");
INSERT INTO federated.t1 VALUES (3, " A floating-point number. p represents the precision. It can be from 0 to 24 for a single-precision floating-point number and from 25 to 53 for a double-precision floating-point number. These types are like the FLOAT and DOUBLE types described immediately following. FLOAT(p) has the same range as the corresponding FLOAT and DOUBLE types, but the display size and number of decimals are undefined. ");
--- 1.37/mysql-test/r/warnings.result 2006-08-14 21:27:47 -07:00
+++ 1.38/mysql-test/r/warnings.result 2006-08-14 21:27:47 -07:00
@@ -72,7 +72,7 @@
create table t1(a tinyint, b int not null, c date, d char(5));
load data infile '../std_data_ln/warnings_loaddata.dat' into table t1 fields terminated by ',';
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'b' at row 2
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 2
Warning 1265 Data truncated for column 'd' at row 3
Warning 1265 Data truncated for column 'c' at row 4
Warning 1261 Row 5 doesn't contain data for all columns
@@ -86,7 +86,7 @@
create table t1(a tinyint NOT NULL, b tinyint unsigned, c char(5));
insert into t1 values(NULL,100,'mysql'),(10,-1,'mysql ab'),(500,256,'open source'),(20,NULL,'test');
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1
Warning 1264 Out of range value adjusted for column 'b' at row 2
Warning 1265 Data truncated for column 'c' at row 2
Warning 1264 Out of range value adjusted for column 'a' at row 3
@@ -99,7 +99,7 @@
alter table t1 add d char(2);
update t1 set a=NULL where a=10;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 2
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 2
update t1 set c='mysql ab' where c='test';
Warnings:
Warning 1265 Data truncated for column 'c' at row 4
@@ -115,7 +115,7 @@
Warning 1265 Data truncated for column 'b' at row 1
Warning 1265 Data truncated for column 'b' at row 2
Warning 1265 Data truncated for column 'b' at row 3
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 4
+Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 4
Warning 1265 Data truncated for column 'b' at row 4
insert into t2(b) values('mysqlab');
Warnings:
| Thread |
|---|
| • bk commit into 5.0 tree (acurtis:1.2253) | antony | 15 Aug |
