diff options
| author | unknown <gshchepa@devsrv-b.mysql.com> | 2007-09-14 17:21:50 +0200 |
|---|---|---|
| committer | unknown <gshchepa@devsrv-b.mysql.com> | 2007-09-14 17:21:50 +0200 |
| commit | c0d75796cd0747c67be5f0085bf1b3841a1844a6 (patch) | |
| tree | 12bfc904f1136f4cee471d6b995e8b29b2b1fa1f /mysql-test/r/sp_gis.result | |
| parent | 1d97c7484b981687394dc55412c5ed6e90968f98 (diff) | |
| download | mariadb-git-c0d75796cd0747c67be5f0085bf1b3841a1844a6.tar.gz | |
Many files:
Merge with 5.0-opt.
mysql-test/r/binlog_unsafe.result:
Merge with 5.0-opt.
mysql-test/r/events_bugs.result:
Merge with 5.0-opt.
mysql-test/r/events_trans.result:
Merge with 5.0-opt.
mysql-test/r/sp.result:
Merge with 5.0-opt.
mysql-test/r/sp_gis.result:
Merge with 5.0-opt.
mysql-test/r/xml.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_incident.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_udf.result:
Merge with 5.0-opt.
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_gis.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_row_format.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_single_user.result:
Merge with 5.0-opt.
Diffstat (limited to 'mysql-test/r/sp_gis.result')
| -rw-r--r-- | mysql-test/r/sp_gis.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sp_gis.result b/mysql-test/r/sp_gis.result index c640e5c46f2..b0960dec647 100644 --- a/mysql-test/r/sp_gis.result +++ b/mysql-test/r/sp_gis.result @@ -7,11 +7,11 @@ return 1; create function x() returns int return 2; Warnings: -Note 1583 This function 'x' has the same name as a native function +Note 1584 This function 'x' has the same name as a native function create function y() returns int return 3; Warnings: -Note 1583 This function 'y' has the same name as a native function +Note 1584 This function 'y' has the same name as a native function select a(); a() 1 |