1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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.
This commit is contained in:
unknown
2007-09-14 17:21:50 +02:00
parent 1d97c7484b
commit c0d75796cd
15 changed files with 62 additions and 62 deletions

View File

@ -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