1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge on pull

BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
This commit is contained in:
unknown
2004-09-09 07:26:28 +03:00
758 changed files with 39936 additions and 18741 deletions

View File

@ -67,7 +67,7 @@ call foo()|
ERROR 42000: PROCEDURE test.foo does not exist
drop procedure if exists foo|
Warnings:
Warning 1304 PROCEDURE foo does not exist
Note 1305 PROCEDURE foo does not exist
show create procedure foo|
ERROR 42000: PROCEDURE foo does not exist
create procedure foo()
@ -144,7 +144,7 @@ declare y int;
set x = y;
end|
Warnings:
Warning 1310 Referring to uninitialized variable y
Warning 1311 Referring to uninitialized variable y
drop procedure foo|
create procedure foo()
return 42|