diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-08-03 13:07:37 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-08-03 13:07:37 +0500 |
| commit | 6930e7dedfec2723ef6b9e38f974e3d1123d022f (patch) | |
| tree | 6128125e04a8bd14a6602230bb57ec3e151fd84c /mysql-test/r/sp_gis.result | |
| parent | bba712a6c8ccab1faa8c6deaf62117c5d6a69495 (diff) | |
| download | mariadb-git-6930e7dedfec2723ef6b9e38f974e3d1123d022f.tar.gz | |
Many files:
Post-merge fix.
mysql-test/r/binlog_unsafe.result:
Post-merge fix.
mysql-test/r/events_bugs.result:
Post-merge fix.
mysql-test/r/events_trans.result:
Post-merge fix.
mysql-test/r/sp.result:
Post-merge fix.
mysql-test/r/sp_gis.result:
Post-merge fix.
mysql-test/r/xml.result:
Post-merge fix.
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 b4fe0872d64..c640e5c46f2 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 1582 This function 'x' has the same name as a native function +Note 1583 This function 'x' has the same name as a native function create function y() returns int return 3; Warnings: -Note 1582 This function 'y' has the same name as a native function +Note 1583 This function 'y' has the same name as a native function select a(); a() 1 |