diff options
| author | unknown <pgalbraith/patg@govinda.patg.net> | 2006-08-16 17:16:36 -0700 |
|---|---|---|
| committer | unknown <pgalbraith/patg@govinda.patg.net> | 2006-08-16 17:16:36 -0700 |
| commit | 2eb9eb9f54e5b44ed524ef8bf6aaa9dd724c8fb4 (patch) | |
| tree | 9380832722e48f02666039e6d763effa2c870f40 /mysql-test | |
| parent | 8ef847ea42ddccd74ee0a0888f8c09df701c2532 (diff) | |
| download | mariadb-git-2eb9eb9f54e5b44ed524ef8bf6aaa9dd724c8fb4.tar.gz | |
test result changes (non-functional) for 5.1-5.0 merge
mysql-test/r/federated_transactions.result:
merge fixes to result file (case sensitivity)
mysql-test/r/warnings.result:
wrong warning message result
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/federated_transactions.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/warnings.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/federated_transactions.result b/mysql-test/r/federated_transactions.result index e6714210ded..40644e3535e 100644 --- a/mysql-test/r/federated_transactions.result +++ b/mysql-test/r/federated_transactions.result @@ -16,7 +16,7 @@ CREATE TABLE federated.t1 ( `id` int(20) NOT NULL, `name` varchar(32) NOT NULL default '' ) -DEFAULT CHARSET=latin1 ENGINE=InnoDB; +DEFAULT CHARSET=latin1 ENGINE=innodb; DROP TABLE IF EXISTS federated.t1; Warnings: Note 1051 Unknown table 't1' diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index a2161a02475..16a7f1a84da 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -72,7 +72,7 @@ drop table t1; 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 was set to data type implicit default; NULL supplied for 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 |