Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.2172 05/03/30 17:32:44 jimw@stripped +25 -0
Remove result.es files and support for them, which requires splitting
up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508).
mysql-test/t/insert_select-binlog.test
1.1 05/03/30 17:32:41 jimw@stripped +34 -0
mysql-test/r/insert_select-binlog.result
1.1 05/03/30 17:32:41 jimw@stripped +25 -0
sql/sql_select.cc
1.403 05/03/30 17:32:41 jimw@stripped +1 -1
Fix conditional around query_cache_abort() call.
mysql-test/t/type_ranges.test
1.10 05/03/30 17:32:41 jimw@stripped +9 -0
Replace grants column from 'show full columns'
mysql-test/t/type_float.test
1.17 05/03/30 17:32:41 jimw@stripped +4 -0
Replace grants column from 'show full columns'
mysql-test/t/type_blob.test
1.24 05/03/30 17:32:41 jimw@stripped +20 -10
Replace grants column from 'show full columns'
mysql-test/t/select.test
1.32 05/03/30 17:32:41 jimw@stripped +4 -0
Replace grants column from 'show full columns'
mysql-test/t/insert_select.test
1.17 05/03/30 17:32:41 jimw@stripped +0 -31
Move binlog test to new file
mysql-test/t/insert_select-binlog.test
1.0 05/03/30 17:32:41 jimw@stripped +0 -0
BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/t/insert_select-binlog.test
mysql-test/t/drop_temp_table.test
1.5 05/03/30 17:32:41 jimw@stripped +3 -0
Skip this test with embedded server
mysql-test/r/insert_select-binlog.result
1.0 05/03/30 17:32:41 jimw@stripped +0 -0
BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/r/insert_select-binlog.result
mysql-test/r/type_ranges.result
1.26 05/03/30 17:32:40 jimw@stripped +80 -80
Update results
mysql-test/r/type_float.result
1.30 05/03/30 17:32:40 jimw@stripped +14 -14
Update results
mysql-test/r/type_blob.result
1.42 05/03/30 17:32:40 jimw@stripped +10 -10
Update results
mysql-test/r/select.result
1.46 05/03/30 17:32:40 jimw@stripped +12 -12
Update results
mysql-test/r/insert_select.result
1.24 05/03/30 17:32:40 jimw@stripped +0 -25
Update results
mysql-test/t/ps_1general.test
1.13 05/03/30 17:31:15 jimw@stripped +2 -1
Explain --replace_result
mysql-test/mysql-test-run.sh
1.247 05/03/30 17:20:39 jimw@stripped +2 -16
Remove support for special result extension -- bad idea!
BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978
1.2 05/03/29 17:18:37 jimw@stripped +0 -0
Delete: mysql-test/r/type_ranges.result.es
BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04
1.6 05/03/29 17:18:37 jimw@stripped +0 -0
Delete: mysql-test/r/type_float.result.es
BitKeeper/deleted/.del-type_blob.result.es~a4a0d4454b2d0218
1.3 05/03/29 17:18:37 jimw@stripped +0 -0
Delete: mysql-test/r/type_blob.result.es
BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079
1.3 05/03/29 17:18:37 jimw@stripped +0 -0
Delete: mysql-test/r/select.result.es
BitKeeper/deleted/.del-query_cache.result.es~246ad731a517d9ab
1.4 05/03/29 17:18:37 jimw@stripped +0 -0
Delete: mysql-test/r/query_cache.result.es
BitKeeper/deleted/.del-packet.result.es~6e71c3b634806185
1.2 05/03/29 17:18:36 jimw@stripped +0 -0
Delete: mysql-test/r/packet.result.es
BitKeeper/deleted/.del-myisam-blob.result.es~d498dae7d9f1a6d4
1.2 05/03/29 17:18:36 jimw@stripped +0 -0
Delete: mysql-test/r/myisam-blob.result.es
BitKeeper/deleted/.del-insert_select.result.es~ae7eb9891d6c07c4
1.4 05/03/29 17:18:36 jimw@stripped +0 -0
Delete: mysql-test/r/insert_select.result.es
BitKeeper/deleted/.del-drop_temp_table.result.es~bc4cfb1ee1257458
1.2 05/03/29 17:18:36 jimw@stripped +0 -0
Delete: mysql-test/r/drop_temp_table.result.es
# 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: jimw
# Host: rama.(none)
# Root: /home/jimw/my/mysql-4.1-no-es
--- 1.246/mysql-test/mysql-test-run.sh 2005-03-29 17:17:43 -08:00
+++ 1.247/mysql-test/mysql-test-run.sh 2005-03-30 17:20:39 -08:00
@@ -240,7 +240,6 @@
MYSQL_TEST_SSL_OPTS=""
USE_TIMER=""
USE_EMBEDDED_SERVER=""
-RESULT_EXT=""
TEST_MODE=""
NDB_MGM_EXTRA_OPTS=
@@ -253,7 +252,6 @@
USE_EMBEDDED_SERVER=1
USE_MANAGER=0 NO_SLAVE=1
USE_RUNNING_SERVER=""
- RESULT_EXT=".es"
TEST_MODE="$TEST_MODE embedded" ;;
--purify)
USE_PURIFY=1
@@ -735,13 +733,6 @@
result_file=r/$1.result
eval_file=r/$1.eval
- # If we have an special externsion for result files we use it if we are recording
- # or a result file with that extension exists.
- if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ]
- then
- result_file="$result_file$RESULT_EXT"
- fi
-
if [ -f $eval_file ]
then
result_file=$eval_file
@@ -1462,9 +1453,6 @@
result_file="r/$tname.result"
echo $tname > $CURRENT_TEST
SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
- if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then
- result_file="$result_file$RESULT_EXT"
- fi
if [ "$USE_MANAGER" = 1 ] ; then
many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)`
fi
@@ -1531,10 +1519,8 @@
--result-file=*)
result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"`
result_file="r/$result_file.result"
- if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then
- result_file="$result_file$RESULT_EXT"
- fi
- # Note that this must be set to space, not "" for test-reset to work
+ # Note that this must be set to space, not "" for test-reset to
+# work
EXTRA_MASTER_OPT=" "
;;
esac
--- 1.402/sql/sql_select.cc 2005-02-09 09:22:35 -08:00
+++ 1.403/sql/sql_select.cc 2005-03-30 17:32:41 -08:00
@@ -4482,7 +4482,7 @@
(thd->options & OPTION_AUTO_IS_NULL) &&
thd->insert_id())
{
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_QUERY_CACHE
query_cache_abort(&thd->net);
#endif
COND *new_cond;
--- 1.12/mysql-test/t/ps_1general.test 2005-03-29 17:17:43 -08:00
+++ 1.13/mysql-test/t/ps_1general.test 2005-03-30 17:31:15 -08:00
@@ -595,7 +595,8 @@
# cases derived from client_test.c: test_rename()
prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ;
create table t5 (a int) ;
-# rename must fail, t7 does not exist
+# rename must fail, t7 does not exist
+# Clean up the filename here because embedded server reports whole path
--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ /
--error 1017
execute stmt1 ;
--- 1.4/mysql-test/t/drop_temp_table.test 2005-02-04 13:43:41 -08:00
+++ 1.5/mysql-test/t/drop_temp_table.test 2005-03-30 17:32:41 -08:00
@@ -1,3 +1,6 @@
+# Embedded server doesn't support binlog
+-- source include/not_embedded.inc
+
connect (con1,localhost,root,,);
connect (con2,localhost,root,,);
connection con1;
--- New file ---
+++ mysql-test/r/insert_select-binlog.result 05/03/30 17:32:41
create table t1(a int, unique(a));
insert into t1 values(2);
create table t2(a int);
insert into t2 values(1),(2);
reset master;
insert into t1 select * from t2;
ERROR 23000: Duplicate entry '2' for key 1
show binlog events;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3
master-bin.000001 79 Query 1 79 use `test`; insert into t1 select * from t2
select * from t1;
a
1
2
drop table t1, t2;
create table t1(a int);
insert into t1 values(1),(1);
reset master;
create table t2(unique(a)) select a from t1;
ERROR 23000: Duplicate entry '1' for key 1
show binlog events;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3
drop table t1;
--- New file ---
+++ mysql-test/t/insert_select-binlog.test 05/03/30 17:32:41
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
# Check if a partly-completed INSERT SELECT in a MyISAM table goes into the
# binlog
create table t1(a int, unique(a));
insert into t1 values(2);
create table t2(a int);
insert into t2 values(1),(2);
reset master;
--error 1062
insert into t1 select * from t2;
# The above should produce an error, but still be in the binlog;
# verify the binlog :
let $VERSION=`select version()`;
--replace_result $VERSION VERSION
show binlog events;
select * from t1;
drop table t1, t2;
# Verify that a partly-completed CREATE TABLE .. SELECT does not
# get into the binlog (Bug #6682)
create table t1(a int);
insert into t1 values(1),(1);
reset master;
--error 1062
create table t2(unique(a)) select a from t1;
# The above should produce an error, *and* not appear in the binlog
let $VERSION=`select version()`;
--replace_result $VERSION VERSION
show binlog events;
drop table t1;
--- 1.23/mysql-test/r/insert_select.result 2005-01-20 03:48:43 -08:00
+++ 1.24/mysql-test/r/insert_select.result 2005-03-30 17:32:40 -08:00
@@ -65,31 +65,6 @@
SELECT 1718,icone,contenu,pseudo,date,signature,ip FROM t2
WHERE numeropost=9 ORDER BY numreponse ASC;
DROP TABLE t1,t2;
-create table t1(a int, unique(a));
-insert into t1 values(2);
-create table t2(a int);
-insert into t2 values(1),(2);
-reset master;
-insert into t1 select * from t2;
-ERROR 23000: Duplicate entry '2' for key 1
-show binlog events;
-Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3
-master-bin.000001 79 Query 1 79 use `test`; insert into t1 select * from t2
-select * from t1;
-a
-1
-2
-drop table t1, t2;
-create table t1(a int);
-insert into t1 values(1),(1);
-reset master;
-create table t2(unique(a)) select a from t1;
-ERROR 23000: Duplicate entry '1' for key 1
-show binlog events;
-Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3
-drop table t1;
create table t1 (a int not null);
create table t2 (a int not null);
insert into t1 values (1);
--- 1.45/mysql-test/r/select.result 2004-11-28 10:47:50 -08:00
+++ 1.46/mysql-test/r/select.result 2005-03-30 17:32:40 -08:00
@@ -2033,20 +2033,20 @@
Tables_in_test (t?)
show full columns from t2;
Field Type Collation Null Key Default Extra Privileges Comment
-auto int(11) NULL PRI NULL auto_increment select,insert,update,references
-fld1 int(6) unsigned zerofill NULL UNI 000000 select,insert,update,references
-companynr tinyint(2) unsigned zerofill NULL 00 select,insert,update,references
-fld3 char(30) latin1_swedish_ci MUL select,insert,update,references
-fld4 char(35) latin1_swedish_ci select,insert,update,references
-fld5 char(35) latin1_swedish_ci select,insert,update,references
-fld6 char(4) latin1_swedish_ci select,insert,update,references
+auto int(11) NULL PRI NULL auto_increment #
+fld1 int(6) unsigned zerofill NULL UNI 000000 #
+companynr tinyint(2) unsigned zerofill NULL 00 #
+fld3 char(30) latin1_swedish_ci MUL #
+fld4 char(35) latin1_swedish_ci #
+fld5 char(35) latin1_swedish_ci #
+fld6 char(4) latin1_swedish_ci #
show full columns from t2 from test like 'f%';
Field Type Collation Null Key Default Extra Privileges Comment
-fld1 int(6) unsigned zerofill NULL UNI 000000 select,insert,update,references
-fld3 char(30) latin1_swedish_ci MUL select,insert,update,references
-fld4 char(35) latin1_swedish_ci select,insert,update,references
-fld5 char(35) latin1_swedish_ci select,insert,update,references
-fld6 char(4) latin1_swedish_ci select,insert,update,references
+fld1 int(6) unsigned zerofill NULL UNI 000000 #
+fld3 char(30) latin1_swedish_ci MUL #
+fld4 char(35) latin1_swedish_ci #
+fld5 char(35) latin1_swedish_ci #
+fld6 char(4) latin1_swedish_ci #
show full columns from t2 from test like 's%';
Field Type Collation Null Key Default Extra Privileges Comment
show keys from t2;
--- 1.41/mysql-test/r/type_blob.result 2004-11-22 10:06:52 -08:00
+++ 1.42/mysql-test/r/type_blob.result 2005-03-30 17:32:40 -08:00
@@ -70,17 +70,17 @@
lock tables t1 READ;
show full fields from t1;
Field Type Collation Null Key Default Extra Privileges Comment
-t text latin1_swedish_ci YES NULL select,insert,update,references
-c varchar(10) latin1_swedish_ci YES NULL select,insert,update,references
-b blob NULL YES NULL select,insert,update,references
-d varbinary(10) NULL YES NULL select,insert,update,references
+t text latin1_swedish_ci YES NULL #
+c varchar(10) latin1_swedish_ci YES NULL #
+b blob NULL YES NULL #
+d varbinary(10) NULL YES NULL #
lock tables t1 WRITE;
show full fields from t1;
Field Type Collation Null Key Default Extra Privileges Comment
-t text latin1_swedish_ci YES NULL select,insert,update,references
-c varchar(10) latin1_swedish_ci YES NULL select,insert,update,references
-b blob NULL YES NULL select,insert,update,references
-d varbinary(10) NULL YES NULL select,insert,update,references
+t text latin1_swedish_ci YES NULL #
+c varchar(10) latin1_swedish_ci YES NULL #
+b blob NULL YES NULL #
+d varbinary(10) NULL YES NULL #
unlock tables;
select t from t1 where t like "hello";
t
@@ -513,10 +513,10 @@
if(imagem is null, "ERROR", "OK") length(imagem)
OK 581
drop table t1;
-create table t1 select load_file('../../std_data/words.dat');
+create table t1 select load_file('../../std_data/words.dat') l;
show full fields from t1;
Field Type Collation Null Key Default Extra Privileges Comment
-load_file('../../std_data/words.dat') longblob NULL YES NULL select,insert,update,references
+l longblob NULL YES NULL #
drop table t1;
create table t1 (id integer primary key auto_increment, txt text not null, unique index txt_index (txt (20)));
insert into t1 (txt) values ('Chevy'), ('Chevy ');
--- 1.29/mysql-test/r/type_float.result 2005-01-18 13:11:46 -08:00
+++ 1.30/mysql-test/r/type_float.result 2005-03-30 17:32:40 -08:00
@@ -11,8 +11,8 @@
create table t1 (f1 float(24),f2 float(52));
show full columns from t1;
Field Type Collation Null Key Default Extra Privileges Comment
-f1 float NULL YES NULL select,insert,update,references
-f2 double NULL YES NULL select,insert,update,references
+f1 float NULL YES NULL #
+f2 double NULL YES NULL #
insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150);
Warnings:
Warning 1264 Data truncated; out of range for column 'f1' at row 7
@@ -97,18 +97,18 @@
create table t1 (f float, f2 float(24), f3 float(6,2), d double, d2 float(53), d3 double(10,3), de decimal, de2 decimal(6), de3 decimal(5,2), n numeric, n2 numeric(8), n3 numeric(5,6));
show full columns from t1;
Field Type Collation Null Key Default Extra Privileges Comment
-f float NULL YES NULL select,insert,update,references
-f2 float NULL YES NULL select,insert,update,references
-f3 float(6,2) NULL YES NULL select,insert,update,references
-d double NULL YES NULL select,insert,update,references
-d2 double NULL YES NULL select,insert,update,references
-d3 double(10,3) NULL YES NULL select,insert,update,references
-de decimal(10,0) NULL YES NULL select,insert,update,references
-de2 decimal(6,0) NULL YES NULL select,insert,update,references
-de3 decimal(5,2) NULL YES NULL select,insert,update,references
-n decimal(10,0) NULL YES NULL select,insert,update,references
-n2 decimal(8,0) NULL YES NULL select,insert,update,references
-n3 decimal(7,6) NULL YES NULL select,insert,update,references
+f float NULL YES NULL #
+f2 float NULL YES NULL #
+f3 float(6,2) NULL YES NULL #
+d double NULL YES NULL #
+d2 double NULL YES NULL #
+d3 double(10,3) NULL YES NULL #
+de decimal(10,0) NULL YES NULL #
+de2 decimal(6,0) NULL YES NULL #
+de3 decimal(5,2) NULL YES NULL #
+n decimal(10,0) NULL YES NULL #
+n2 decimal(8,0) NULL YES NULL #
+n3 decimal(7,6) NULL YES NULL #
drop table t1;
create table t1 (a decimal(7,3) not null, key (a));
insert into t1 values ("0"),("-0.00"),("-0.01"),("-0.002"),("1");
--- 1.25/mysql-test/r/type_ranges.result 2004-08-26 04:31:33 -07:00
+++ 1.26/mysql-test/r/type_ranges.result 2005-03-30 17:32:40 -08:00
@@ -40,30 +40,30 @@
);
show full fields from t1;
Field Type Collation Null Key Default Extra Privileges Comment
-auto int(5) unsigned NULL PRI NULL auto_increment select,insert,update,references
-string varchar(10) latin1_swedish_ci YES hello select,insert,update,references
-tiny tinyint(4) NULL MUL 0 select,insert,update,references
-short smallint(6) NULL MUL 1 select,insert,update,references
-medium mediumint(8) NULL MUL 0 select,insert,update,references
-long_int int(11) NULL 0 select,insert,update,references
-longlong bigint(13) NULL MUL 0 select,insert,update,references
-real_float float(13,1) NULL MUL 0.0 select,insert,update,references
-real_double double(16,4) NULL YES NULL select,insert,update,references
-utiny tinyint(3) unsigned NULL MUL 0 select,insert,update,references
-ushort smallint(5) unsigned zerofill NULL MUL 00000 select,insert,update,references
-umedium mediumint(8) unsigned NULL MUL 0 select,insert,update,references
-ulong int(11) unsigned NULL MUL 0 select,insert,update,references
-ulonglong bigint(13) unsigned NULL MUL 0 select,insert,update,references
-time_stamp timestamp NULL YES CURRENT_TIMESTAMP select,insert,update,references
-date_field date NULL YES NULL select,insert,update,references
-time_field time NULL YES NULL select,insert,update,references
-date_time datetime NULL YES NULL select,insert,update,references
-blob_col blob NULL YES NULL select,insert,update,references
-tinyblob_col tinyblob NULL YES NULL select,insert,update,references
-mediumblob_col mediumblob NULL select,insert,update,references
-longblob_col longblob NULL select,insert,update,references
-options enum('one','two','tree') latin1_swedish_ci MUL one select,insert,update,references
-flags set('one','two','tree') latin1_swedish_ci select,insert,update,references
+auto int(5) unsigned NULL PRI NULL auto_increment #
+string varchar(10) latin1_swedish_ci YES hello #
+tiny tinyint(4) NULL MUL 0 #
+short smallint(6) NULL MUL 1 #
+medium mediumint(8) NULL MUL 0 #
+long_int int(11) NULL 0 #
+longlong bigint(13) NULL MUL 0 #
+real_float float(13,1) NULL MUL 0.0 #
+real_double double(16,4) NULL YES NULL #
+utiny tinyint(3) unsigned NULL MUL 0 #
+ushort smallint(5) unsigned zerofill NULL MUL 00000 #
+umedium mediumint(8) unsigned NULL MUL 0 #
+ulong int(11) unsigned NULL MUL 0 #
+ulonglong bigint(13) unsigned NULL MUL 0 #
+time_stamp timestamp NULL YES CURRENT_TIMESTAMP #
+date_field date NULL YES NULL #
+time_field time NULL YES NULL #
+date_time datetime NULL YES NULL #
+blob_col blob NULL YES NULL #
+tinyblob_col tinyblob NULL YES NULL #
+mediumblob_col mediumblob NULL #
+longblob_col longblob NULL #
+options enum('one','two','tree') latin1_swedish_ci MUL one #
+flags set('one','two','tree') latin1_swedish_ci #
show keys from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 0 PRIMARY 1 auto A 0 NULL NULL BTREE
@@ -208,56 +208,56 @@
update t2 set string="changed" where auto=16;
show full columns from t1;
Field Type Collation Null Key Default Extra Privileges Comment
-auto int(5) unsigned NULL MUL NULL auto_increment select,insert,update,references
-string varchar(10) latin1_swedish_ci YES new defaul select,insert,update,references
-tiny tinyint(4) NULL MUL 0 select,insert,update,references
-short smallint(6) NULL MUL 0 select,insert,update,references
-medium mediumint(8) NULL MUL 0 select,insert,update,references
-long_int int(11) NULL 0 select,insert,update,references
-longlong bigint(13) NULL MUL 0 select,insert,update,references
-real_float float(13,1) NULL MUL 0.0 select,insert,update,references
-real_double double(16,4) NULL YES NULL select,insert,update,references
-utiny tinyint(3) unsigned NULL 0 select,insert,update,references
-ushort smallint(5) unsigned zerofill NULL 00000 select,insert,update,references
-umedium mediumint(8) unsigned NULL MUL 0 select,insert,update,references
-ulong int(11) unsigned NULL MUL 0 select,insert,update,references
-ulonglong bigint(13) unsigned NULL MUL 0 select,insert,update,references
-time_stamp timestamp NULL YES CURRENT_TIMESTAMP select,insert,update,references
-date_field varchar(10) latin1_swedish_ci YES NULL select,insert,update,references
-time_field time NULL YES NULL select,insert,update,references
-date_time datetime NULL YES NULL select,insert,update,references
-new_blob_col varchar(20) latin1_swedish_ci YES NULL select,insert,update,references
-tinyblob_col tinyblob NULL YES NULL select,insert,update,references
-mediumblob_col mediumblob NULL select,insert,update,references
-options enum('one','two','tree') latin1_swedish_ci MUL one select,insert,update,references
-flags set('one','two','tree') latin1_swedish_ci select,insert,update,references
-new_field varchar(10) latin1_swedish_ci new select,insert,update,references
+auto int(5) unsigned NULL MUL NULL auto_increment #
+string varchar(10) latin1_swedish_ci YES new defaul #
+tiny tinyint(4) NULL MUL 0 #
+short smallint(6) NULL MUL 0 #
+medium mediumint(8) NULL MUL 0 #
+long_int int(11) NULL 0 #
+longlong bigint(13) NULL MUL 0 #
+real_float float(13,1) NULL MUL 0.0 #
+real_double double(16,4) NULL YES NULL #
+utiny tinyint(3) unsigned NULL 0 #
+ushort smallint(5) unsigned zerofill NULL 00000 #
+umedium mediumint(8) unsigned NULL MUL 0 #
+ulong int(11) unsigned NULL MUL 0 #
+ulonglong bigint(13) unsigned NULL MUL 0 #
+time_stamp timestamp NULL YES CURRENT_TIMESTAMP #
+date_field varchar(10) latin1_swedish_ci YES NULL #
+time_field time NULL YES NULL #
+date_time datetime NULL YES NULL #
+new_blob_col varchar(20) latin1_swedish_ci YES NULL #
+tinyblob_col tinyblob NULL YES NULL #
+mediumblob_col mediumblob NULL #
+options enum('one','two','tree') latin1_swedish_ci MUL one #
+flags set('one','two','tree') latin1_swedish_ci #
+new_field varchar(10) latin1_swedish_ci new #
show full columns from t2;
Field Type Collation Null Key Default Extra Privileges Comment
-auto int(5) unsigned NULL 0 select,insert,update,references
-string varchar(10) latin1_swedish_ci YES new defaul select,insert,update,references
-tiny tinyint(4) NULL 0 select,insert,update,references
-short smallint(6) NULL 0 select,insert,update,references
-medium mediumint(8) NULL 0 select,insert,update,references
-long_int int(11) NULL 0 select,insert,update,references
-longlong bigint(13) NULL 0 select,insert,update,references
-real_float float(13,1) NULL 0.0 select,insert,update,references
-real_double double(16,4) NULL YES NULL select,insert,update,references
-utiny tinyint(3) unsigned NULL 0 select,insert,update,references
-ushort smallint(5) unsigned zerofill NULL 00000 select,insert,update,references
-umedium mediumint(8) unsigned NULL 0 select,insert,update,references
-ulong int(11) unsigned NULL 0 select,insert,update,references
-ulonglong bigint(13) unsigned NULL 0 select,insert,update,references
-time_stamp timestamp NULL YES 0000-00-00 00:00:00 select,insert,update,references
-date_field varchar(10) latin1_swedish_ci YES NULL select,insert,update,references
-time_field time NULL YES NULL select,insert,update,references
-date_time datetime NULL YES NULL select,insert,update,references
-new_blob_col varchar(20) latin1_swedish_ci YES NULL select,insert,update,references
-tinyblob_col tinyblob NULL YES NULL select,insert,update,references
-mediumblob_col mediumblob NULL select,insert,update,references
-options enum('one','two','tree') latin1_swedish_ci one select,insert,update,references
-flags set('one','two','tree') latin1_swedish_ci select,insert,update,references
-new_field varchar(10) latin1_swedish_ci new select,insert,update,references
+auto int(5) unsigned NULL 0 #
+string varchar(10) latin1_swedish_ci YES new defaul #
+tiny tinyint(4) NULL 0 #
+short smallint(6) NULL 0 #
+medium mediumint(8) NULL 0 #
+long_int int(11) NULL 0 #
+longlong bigint(13) NULL 0 #
+real_float float(13,1) NULL 0.0 #
+real_double double(16,4) NULL YES NULL #
+utiny tinyint(3) unsigned NULL 0 #
+ushort smallint(5) unsigned zerofill NULL 00000 #
+umedium mediumint(8) unsigned NULL 0 #
+ulong int(11) unsigned NULL 0 #
+ulonglong bigint(13) unsigned NULL 0 #
+time_stamp timestamp NULL YES 0000-00-00 00:00:00 #
+date_field varchar(10) latin1_swedish_ci YES NULL #
+time_field time NULL YES NULL #
+date_time datetime NULL YES NULL #
+new_blob_col varchar(20) latin1_swedish_ci YES NULL #
+tinyblob_col tinyblob NULL YES NULL #
+mediumblob_col mediumblob NULL #
+options enum('one','two','tree') latin1_swedish_ci one #
+flags set('one','two','tree') latin1_swedish_ci #
+new_field varchar(10) latin1_swedish_ci new #
select t1.auto,t2.auto from t1,t2 where t1.auto=t2.auto and ((t1.string<>t2.string and (t1.string is not null or t2.string is not null)) or (t1.tiny<>t2.tiny and (t1.tiny is not null or t2.tiny is not null)) or (t1.short<>t2.short and (t1.short is not null or t2.short is not null)) or (t1.medium<>t2.medium and (t1.medium is not null or t2.medium is not null)) or (t1.long_int<>t2.long_int and (t1.long_int is not null or t2.long_int is not null)) or (t1.longlong<>t2.longlong and (t1.longlong is not null or t2.longlong is not null)) or (t1.real_float<>t2.real_float and (t1.real_float is not null or t2.real_float is not null)) or (t1.real_double<>t2.real_double and (t1.real_double is not null or t2.real_double is not null)) or (t1.utiny<>t2.utiny and (t1.utiny is not null or t2.utiny is not null)) or (t1.ushort<>t2.ushort and (t1.ushort is not null or t2.ushort is not null)) or (t1.umedium<>t2.umedium and (t1.umedium is not null or t2.umedium is not null)) or (t1.ulong<>t2.ulong and (t1.ulong is not null or t2.ulong is not null)) or (t1.ulonglong<>t2.ulonglong and (t1.ulonglong is not null or t2.ulonglong is not null)) or (t1.time_stamp<>t2.time_stamp and (t1.time_stamp is not null or t2.time_stamp is not null)) or (t1.date_field<>t2.date_field and (t1.date_field is not null or t2.date_field is not null)) or (t1.time_field<>t2.time_field and (t1.time_field is not null or t2.time_field is not null)) or (t1.date_time<>t2.date_time and (t1.date_time is not null or t2.date_time is not null)) or (t1.new_blob_col<>t2.new_blob_col and (t1.new_blob_col is not null or t2.new_blob_col is not null)) or (t1.tinyblob_col<>t2.tinyblob_col and (t1.tinyblob_col is not null or t2.tinyblob_col is not null)) or (t1.mediumblob_col<>t2.mediumblob_col and (t1.mediumblob_col is not null or t2.mediumblob_col is not null)) or (t1.options<>t2.options and (t1.options is not null or t2.options is not null)) or (t1.flags<>t2.flags and (t1.flags is not null or t2.flags is not null)) or (t1.new_field<>t2.new_field and (t1.new_field is not null or t2.new_field is not null)));
auto auto
16 16
@@ -268,11 +268,11 @@
create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, "a" as t2, repeat("a",256) as t3, binary repeat("b",256) as t4 from t1;
show full columns from t2;
Field Type Collation Null Key Default Extra Privileges Comment
-auto bigint(17) unsigned NULL PRI 0 select,insert,update,references
-t1 bigint(1) NULL 0 select,insert,update,references
-t2 char(1) latin1_swedish_ci select,insert,update,references
-t3 longtext latin1_swedish_ci select,insert,update,references
-t4 longblob NULL select,insert,update,references
+auto bigint(17) unsigned NULL PRI 0 #
+t1 bigint(1) NULL 0 #
+t2 char(1) latin1_swedish_ci #
+t3 longtext latin1_swedish_ci #
+t4 longblob NULL #
select * from t2;
auto t1 t2 t3 t4
11 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
@@ -291,9 +291,9 @@
create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2;
show full columns from t3;
Field Type Collation Null Key Default Extra Privileges Comment
-c1 int(11) NULL YES NULL select,insert,update,references
-c2 int(11) NULL YES NULL select,insert,update,references
-const bigint(1) NULL 0 select,insert,update,references
+c1 int(11) NULL YES NULL #
+c2 int(11) NULL YES NULL #
+const bigint(1) NULL 0 #
drop table t1,t2,t3;
create table t1 ( myfield INT NOT NULL, UNIQUE INDEX (myfield), unique (myfield), index(myfield));
drop table t1;
--- 1.16/mysql-test/t/insert_select.test 2005-01-20 03:48:43 -08:00
+++ 1.17/mysql-test/t/insert_select.test 2005-03-30 17:32:41 -08:00
@@ -71,37 +71,6 @@
DROP TABLE t1,t2;
-# Check if a partly-completed INSERT SELECT in a MyISAM table goes
-# into the binlog
-
-create table t1(a int, unique(a));
-insert into t1 values(2);
-create table t2(a int);
-insert into t2 values(1),(2);
-reset master;
---error 1062
-insert into t1 select * from t2;
-# The above should produce an error, but still be in the binlog;
-# verify the binlog :
-let $VERSION=`select version()`;
---replace_result $VERSION VERSION
-show binlog events;
-select * from t1;
-drop table t1, t2;
-
-# Verify that a partly-completed CREATE TABLE .. SELECT does not
-# get into the binlog (Bug #6682)
-create table t1(a int);
-insert into t1 values(1),(1);
-reset master;
---error 1062
-create table t2(unique(a)) select a from t1;
-# The above should produce an error, *and* not appear in the binlog
-let $VERSION=`select version()`;
---replace_result $VERSION VERSION
-show binlog events;
-drop table t1;
-
#
# Test of insert ... select from same table
#
--- 1.31/mysql-test/t/select.test 2004-11-28 10:47:50 -08:00
+++ 1.32/mysql-test/t/select.test 2005-03-30 17:32:41 -08:00
@@ -1742,8 +1742,12 @@
show tables;
show tables from test like "s%";
show tables from test like "t?";
+# We mask out the Privileges column because it differs with embedded server
+--replace_column 8 #
show full columns from t2;
+--replace_column 8 #
show full columns from t2 from test like 'f%';
+--replace_column 8 #
show full columns from t2 from test like 's%';
show keys from t2;
--- 1.23/mysql-test/t/type_blob.test 2004-11-22 10:06:53 -08:00
+++ 1.24/mysql-test/t/type_blob.test 2005-03-30 17:32:41 -08:00
@@ -77,8 +77,11 @@
update t1 set c="",b=null where c="1";
lock tables t1 READ;
+# We mask out the Privileges column because it differs for embedded server
+--replace_column 8 #
show full fields from t1;
lock tables t1 WRITE;
+--replace_column 8 #
show full fields from t1;
unlock tables;
@@ -299,18 +302,25 @@
create table t1 (id integer auto_increment unique,imagem LONGBLOB not null);
insert into t1 (id) values (1);
-select
- charset(load_file('../../std_data/words.dat')),
- collation(load_file('../../std_data/words.dat')),
- coercibility(load_file('../../std_data/words.dat'));
-explain extended select
- charset(load_file('../../std_data/words.dat')),
- collation(load_file('../../std_data/words.dat')),
- coercibility(load_file('../../std_data/words.dat'));
-update t1 set imagem=load_file('../../std_data/words.dat') where id=1;
+# We have to clean up the path in the results for safe comparison
+--replace_result $MYSQL_TEST_DIR ../..
+eval select
+ charset(load_file('$MYSQL_TEST_DIR/std_data/words.dat')),
+ collation(load_file('$MYSQL_TEST_DIR/std_data/words.dat')),
+ coercibility(load_file('$MYSQL_TEST_DIR/std_data/words.dat'));
+--replace_result $MYSQL_TEST_DIR ../..
+eval explain extended select
+ charset(load_file('$MYSQL_TEST_DIR/std_data/words.dat')),
+ collation(load_file('$MYSQL_TEST_DIR/std_data/words.dat')),
+ coercibility(load_file('$MYSQL_TEST_DIR/std_data/words.dat'));
+--replace_result $MYSQL_TEST_DIR ../..
+eval update t1 set imagem=load_file('$MYSQL_TEST_DIR/std_data/words.dat') where id=1;
select if(imagem is null, "ERROR", "OK"),length(imagem) from t1 where id = 1;
drop table t1;
-create table t1 select load_file('../../std_data/words.dat');
+--replace_result $MYSQL_TEST_DIR ../..
+eval create table t1 select load_file('$MYSQL_TEST_DIR/std_data/words.dat') l;
+# We mask out the Privileges column because it differs for embedded server
+--replace_column 8 #
show full fields from t1;
drop table t1;
--- 1.16/mysql-test/t/type_float.test 2005-01-18 12:25:53 -08:00
+++ 1.17/mysql-test/t/type_float.test 2005-03-30 17:32:41 -08:00
@@ -13,6 +13,8 @@
SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1;
create table t1 (f1 float(24),f2 float(52));
+# We mask out Privileges column because it differs for embedded server
+--replace_column 8 #
show full columns from t1;
insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150);
insert into t1 values(-10,-10),(1e-5,1e-5),(1e-10,1e-10),(1e-15,1e-15),(1e-20,1e-20),(1e-50,1e-50),(1e-150,1e-150);
@@ -63,6 +65,8 @@
#
create table t1 (f float, f2 float(24), f3 float(6,2), d double, d2 float(53), d3 double(10,3), de decimal, de2 decimal(6), de3 decimal(5,2), n numeric, n2 numeric(8), n3 numeric(5,6));
+# We mask out Privileges column because it differs for embedded server
+--replace_column 8 #
show full columns from t1;
drop table t1;
--- 1.9/mysql-test/t/type_ranges.test 2004-11-02 10:13:23 -08:00
+++ 1.10/mysql-test/t/type_ranges.test 2005-03-30 17:32:41 -08:00
@@ -46,6 +46,8 @@
KEY (options,flags)
);
+# We mask out the Privileges column because it differs with embedded server
+--replace_column 8 #
show full fields from t1;
show keys from t1;
@@ -120,7 +122,10 @@
create table t2 select * from t1;
update t2 set string="changed" where auto=16;
+# We mask out the Privileges column because it differs with embedded server
+--replace_column 8 #
show full columns from t1;
+--replace_column 8 #
show full columns from t2;
select t1.auto,t2.auto from t1,t2 where t1.auto=t2.auto and ((t1.string<>t2.string and (t1.string is not null or t2.string is not null)) or (t1.tiny<>t2.tiny and (t1.tiny is not null or t2.tiny is not null)) or (t1.short<>t2.short and (t1.short is not null or t2.short is not null)) or (t1.medium<>t2.medium and (t1.medium is not null or t2.medium is not null)) or (t1.long_int<>t2.long_int and (t1.long_int is not null or t2.long_int is not null)) or (t1.longlong<>t2.longlong and (t1.longlong is not null or t2.longlong is not null)) or (t1.real_float<>t2.real_float and (t1.real_float is not null or t2.real_float is not null)) or (t1.real_double<>t2.real_double and (t1.real_double is not null or t2.real_double is not null)) or (t1.utiny<>t2.utiny and (t1.utiny is not null or t2.utiny is not null)) or (t1.ushort<>t2.ushort and (t1.ushort is not null or t2.ushort is not null)) or (t1.umedium<>t2.umedium and (t1.umedium is not null or t2.umedium is not null)) or (t1.ulong<>t2.ulong and (t1.ulong is not null or t2.ulong is not null)) or (t1.ulonglong<>t2.ulonglong and (t1.ulonglong is not null or t2.ulonglong is not null)) or (t1.time_stamp<>t2.time_stamp and (t1.time_stamp is not null or t2.time_stamp is not null)) or (t1.date_field<>t2.date_field and (t1.date_field is not null or t2.date_field is not null)) or (t1.time_field<>t2.time_field and (t1.time_field is not null or t2.time_field is not null)) or (t1.date_time<>t2.date_time and (t1.date_time is not null or t2.date_time is not null)) or (t1.new_blob_col<>t2.new_blob_col and (t1.new_blob_col is not null or t2.new_blob_col is not null)) or (t1.tinyblob_col<>t2.tinyblob_col and (t1.tinyblob_col is not null or t2.tinyblob_col is not null)) or (t1.mediumblob_col<>t2.mediumblob_col and (t1.mediumblob_col is not null or t2.mediumblob_col is not null)) or (t1.options<>t2.options and (t1.options is not null or t2.options is not null)) or (t1.flags<>t2.flags and (t1.flags is not null or t2.flags is not null)) or (t1.new_field<>t2.new_field and (t1.new_field is not null or t2.new_field is not null)));
select t1.auto,t2.auto from t1,t2 where t1.auto=t2.auto and not (t1.string<=>t2.string and t1.tiny<=>t2.tiny and t1.short<=>t2.short and t1.medium<=>t2.medium and t1.long_int<=>t2.long_int and t1.longlong<=>t2.longlong and t1.real_float<=>t2.real_float and t1.real_double<=>t2.real_double and t1.utiny<=>t2.utiny and t1.ushort<=>t2.ushort and t1.umedium<=>t2.umedium and t1.ulong<=>t2.ulong and t1.ulonglong<=>t2.ulonglong and t1.time_stamp<=>t2.time_stamp and t1.date_field<=>t2.date_field and t1.time_field<=>t2.time_field and t1.date_time<=>t2.date_time and t1.new_blob_col<=>t2.new_blob_col and t1.tinyblob_col<=>t2.tinyblob_col and t1.mediumblob_col<=>t2.mediumblob_col and t1.options<=>t2.options and t1.flags<=>t2.flags and t1.new_field<=>t2.new_field);
@@ -128,6 +133,8 @@
drop table t2;
create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, "a" as t2, repeat("a",256) as t3, binary repeat("b",256) as t4 from t1;
+# We mask out the Privileges column because it differs with embedded server
+--replace_column 8 #
show full columns from t2;
select * from t2;
drop table t1,t2;
@@ -138,6 +145,8 @@
--error 1060
create table t3 select * from t1, t2; # Should give an error
create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2;
+# We mask out the Privileges column because it differs with embedded server
+--replace_column 8 #
show full columns from t3;
drop table t1,t2,t3;
| Thread |
|---|
| • bk commit into 4.1 tree (jimw:1.2172) | Jim Winstead | 31 Mar |
