diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-19 01:01:54 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-19 01:01:54 +0200 |
| commit | 15a86d185da20b26744c4cf9329c12fbed207a2a (patch) | |
| tree | ae7b35a52b5938cfcb0ee9c2b34078f346483d94 /mysql-test/t/sp.test | |
| parent | 54fadc5b88824886d34242f2fd871c856a8f006b (diff) | |
| parent | d8d57c77b1f3490b69e0ed116a766b6434137ecd (diff) | |
| download | mariadb-git-15a86d185da20b26744c4cf9329c12fbed207a2a.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug22436/my50-bug22436
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/r/create.result:
Merge
mysql-test/t/create.test:
Merge
mysql-test/t/view.test:
Remove the disable_warnings part as engine=innodb has been removed
Diffstat (limited to 'mysql-test/t/sp.test')
| -rw-r--r-- | mysql-test/t/sp.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 83ad965fc55..a6f64161c0f 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -5630,7 +5630,10 @@ drop procedure bug16887| # Bug#13575 SP funcs in select with distinct/group and order by can # produce bad data # +# Disable warnings to allow test to run also without InnoDB +--disable_warnings create table t3 (f1 int, f2 varchar(3), primary key(f1)) engine=innodb| +--enable_warnings insert into t3 values (1,'aaa'),(2,'bbb'),(3,'ccc')| CREATE FUNCTION bug13575 ( p1 integer ) returns varchar(3) |