Commit 9282ad20 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents 23b2d1d2 713af2ae

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.14-beta)

AM_INIT_AUTOMAKE(mysql, 5.1.15-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

mysql-test/mysql-test-run.pl

+3 −0
Original line number Diff line number Diff line
@@ -786,6 +786,9 @@ sub command_line_setup () { 
    {

      # Only platforms that have native symlinks can use the vardir trick

      $opt_mem= $opt_vardir;

      # Delete the default directory in case it exists since we're going to create

      # a new one later anyway, and the mkpath below throws a fatal error otherwise

      eval { rmtree($default_vardir, 1, 1); };

      mtr_report("Using 4.1 vardir trick");

    }

mysql-test/r/parser.result

+101 −0
Original line number Diff line number Diff line
@@ -373,3 +373,104 @@ select yearweek(); 
ERROR 42000: Incorrect parameter count in the call to native function 'yearweek'

select yearweek(1, 2, 3);

ERROR 42000: Incorrect parameter count in the call to native function 'yearweek'

select abs(3);

abs(3)

3

select abs(3 AS three);

ERROR 42000: Incorrect parameters in the call to native function 'abs'

select abs(3 three);

ERROR 42000: Incorrect parameters in the call to native function 'abs'

select abs(3 AS "three");

ERROR 42000: Incorrect parameters in the call to native function 'abs'

select abs(3 "three");

ERROR 42000: Incorrect parameters in the call to native function 'abs'

set @bar="bar";

set @foobar="foobar";

select instr("foobar", "bar");

instr("foobar", "bar")

4

select instr("foobar" AS p1, "bar");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar" p1, "bar");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar" AS "p1", "bar");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar" "p1", "bar");

instr("foobar" "p1", "bar")

4

select instr(@foobar "p1", "bar");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar", "bar" AS p2);

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar", "bar" p2);

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar", "bar" AS "p2");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar", "bar" "p2");

instr("foobar", "bar" "p2")

0

select instr("foobar", @bar "p2");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar" AS p1, "bar" AS p2);

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select conv(255, 10, 16);

conv(255, 10, 16)

FF

select conv(255 AS p1, 10, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255 p1, 10, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255 AS "p1", 10, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255 "p1", 10, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10 AS p2, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10 p2, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10 AS "p2", 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10 "p2", 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10, 16 AS p3);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10, 16 p3);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10, 16 AS "p3");

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10, 16 "p3");

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255 AS p1, 10 AS p2, 16 AS p3);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select atan(10);

atan(10)

1.4711276743037

select atan(10 AS p1);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 p1);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 AS "p1");

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 "p1");

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10, 20);

atan(10, 20)

0.46364760900081

select atan(10 AS p1, 20);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 p1, 20);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 AS "p1", 20);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 "p1", 20);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10, 20 AS p2);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10, 20 p2);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10, 20 AS "p2");

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10, 20 "p2");

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 AS p1, 20 AS p2);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

mysql-test/r/sp.result

+4 −4
Original line number Diff line number Diff line
@@ -5633,7 +5633,7 @@ drop function if exists pi; 
create function pi() returns varchar(50)

return "pie, my favorite desert.";

Warnings:

Note	1578	This function 'pi' has the same name as a native function.

Note	1579	This function 'pi' has the same name as a native function.

SET @save_sql_mode=@@sql_mode;

SET SQL_MODE='IGNORE_SPACE';

select pi(), pi ();
@@ -5682,15 +5682,15 @@ use test; 
create function `database`() returns varchar(50)

return "Stored function database";

Warnings:

Note	1578	This function 'database' has the same name as a native function.

Note	1579	This function 'database' has the same name as a native function.

create function `current_user`() returns varchar(50)

return "Stored function current_user";

Warnings:

Note	1578	This function 'current_user' has the same name as a native function.

Note	1579	This function 'current_user' has the same name as a native function.

create function md5(x varchar(50)) returns varchar(50)

return "Stored function md5";

Warnings:

Note	1578	This function 'md5' has the same name as a native function.

Note	1579	This function 'md5' has the same name as a native function.

SET SQL_MODE='IGNORE_SPACE';

select database(), database ();

database()	database ()

mysql-test/r/sp_gis.result

+2 −2
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ return 1; 
create function x() returns int

return 2;

Warnings:

Note	1578	This function 'x' has the same name as a native function.

Note	1579	This function 'x' has the same name as a native function.

create function y() returns int

return 3;

Warnings:

Note	1578	This function 'y' has the same name as a native function.

Note	1579	This function 'y' has the same name as a native function.

select a();

a()

1