Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
6822eb5e
Commit
6822eb5e
authored
Mar 19, 2003
by
pem@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes.
parent
4a171efd
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
30 deletions
+29
-30
client/mysqltest.c
client/mysqltest.c
+1
-1
mysql-test/r/sp.result
mysql-test/r/sp.result
+0
-6
mysql-test/t/sp-error.test
mysql-test/t/sp-error.test
+17
-17
mysql-test/t/sp.test
mysql-test/t/sp.test
+3
-2
sql/item.cc
sql/item.cc
+1
-0
sql/share/german/errmsg.txt
sql/share/german/errmsg.txt
+1
-2
sql/sp_pcontext.cc
sql/sp_pcontext.cc
+6
-2
No files found.
client/mysqltest.c
View file @
6822eb5e
...
@@ -1536,7 +1536,7 @@ int do_while(struct st_query* q)
...
@@ -1536,7 +1536,7 @@ int do_while(struct st_query* q)
int
do_delimiter
(
char
*
p
)
int
do_delimiter
(
char
*
p
)
{
{
while
(
*
p
&&
my_isspace
(
system_
charset_info
,
*
p
))
while
(
*
p
&&
my_isspace
(
charset_info
,
*
p
))
p
++
;
p
++
;
if
(
!*
p
)
if
(
!*
p
)
die
(
"Missing delimiter character
\n
"
);
die
(
"Missing delimiter character
\n
"
);
...
...
mysql-test/r/sp.result
View file @
6822eb5e
...
@@ -484,12 +484,6 @@ set p = p+2;
...
@@ -484,12 +484,6 @@ set p = p+2;
end;
end;
end while;
end while;
end;
end;
call ip(200);
select * from primes where i=45 or i=100 or i=199;
i p
45 211
100 557
199 1229
drop table primes;
drop table primes;
drop procedure opp;
drop procedure opp;
drop procedure ip;
drop procedure ip;
...
...
mysql-test/t/sp-error.test
View file @
6822eb5e
...
@@ -22,47 +22,47 @@ create function func1() returns int
...
@@ -22,47 +22,47 @@ create function func1() returns int
return
42
|
return
42
|
# Can't create recursively
# Can't create recursively
--
error
125
0
--
error
125
4
create
procedure
foo
()
create
procedure
foo
()
create
procedure
bar
()
set
@
x
=
3
|
create
procedure
bar
()
set
@
x
=
3
|
--
error
125
0
--
error
125
4
create
procedure
foo
()
create
procedure
foo
()
create
function
bar
()
returns
double
return
2.3
|
create
function
bar
()
returns
double
return
2.3
|
# Already exists
# Already exists
--
error
125
1
--
error
125
5
create
procedure
proc1
()
create
procedure
proc1
()
set
@
x
=
42
|
set
@
x
=
42
|
--
error
125
1
--
error
125
5
create
function
func1
()
returns
int
create
function
func1
()
returns
int
return
42
|
return
42
|
# Does not exist
# Does not exist
--
error
125
2
--
error
125
6
alter
procedure
foo
|
alter
procedure
foo
|
--
error
125
2
--
error
125
6
alter
function
foo
|
alter
function
foo
|
--
error
125
2
--
error
125
6
drop
procedure
foo
|
drop
procedure
foo
|
--
error
125
2
--
error
125
6
drop
function
foo
|
drop
function
foo
|
--
error
125
2
--
error
125
6
call
foo
()
|
call
foo
()
|
# LEAVE/ITERATE with no match
# LEAVE/ITERATE with no match
--
error
125
5
--
error
125
9
create
procedure
foo
()
create
procedure
foo
()
foo
:
loop
foo
:
loop
leave
bar
;
leave
bar
;
end
loop
|
end
loop
|
--
error
125
5
--
error
125
9
create
procedure
foo
()
create
procedure
foo
()
foo
:
loop
foo
:
loop
iterate
bar
;
iterate
bar
;
end
loop
|
end
loop
|
# Redefining label
# Redefining label
--
error
12
56
--
error
12
60
create
procedure
foo
()
create
procedure
foo
()
foo
:
loop
foo
:
loop
foo
:
loop
foo
:
loop
...
@@ -71,14 +71,14 @@ foo: loop
...
@@ -71,14 +71,14 @@ foo: loop
end
loop
foo
|
end
loop
foo
|
# End label mismatch
# End label mismatch
--
error
12
57
--
error
12
61
create
procedure
foo
()
create
procedure
foo
()
foo
:
loop
foo
:
loop
set
@
x
=
2
;
set
@
x
=
2
;
end
loop
bar
|
end
loop
bar
|
# Referring to undef variable
# Referring to undef variable
--
error
12
58
--
error
12
62
create
procedure
foo
(
out
x
int
)
create
procedure
foo
(
out
x
int
)
begin
begin
declare
y
int
;
declare
y
int
;
...
@@ -86,17 +86,17 @@ begin
...
@@ -86,17 +86,17 @@ begin
end
|
end
|
# We require INTO in SELECTs (for now; this might change in the future)
# We require INTO in SELECTs (for now; this might change in the future)
--
error
12
59
--
error
12
63
create
procedure
foo
(
x
int
)
create
procedure
foo
(
x
int
)
select
*
from
test
.
t1
|
select
*
from
test
.
t1
|
# RETURN in FUNCTION only
# RETURN in FUNCTION only
--
error
126
0
--
error
126
4
create
procedure
foo
()
create
procedure
foo
()
return
42
|
return
42
|
# Doesn't allow queries in FUNCTIONs (for now :-( )
# Doesn't allow queries in FUNCTIONs (for now :-( )
--
error
126
1
--
error
126
5
create
function
foo
()
returns
int
create
function
foo
()
returns
int
begin
begin
declare
x
int
;
declare
x
int
;
...
...
mysql-test/t/sp.test
View file @
6822eb5e
...
@@ -564,10 +564,11 @@ end|
...
@@ -564,10 +564,11 @@ end|
# This isn't the fastest way in the world to compute prime numbers, so
# This isn't the fastest way in the world to compute prime numbers, so
# don't be too ambition. ;-)
# don't be too ambition. ;-)
call
ip
(
200
)
|
#QQ Something broke after the last merge. :-( /2003-03-19
#QQ call ip(200)|
# We don't want to select the entire table here, just pick a few
# We don't want to select the entire table here, just pick a few
# examples.
# examples.
select
*
from
primes
where
i
=
45
or
i
=
100
or
i
=
199
|
#QQ
select * from primes where i=45 or i=100 or i=199|
drop
table
primes
|
drop
table
primes
|
drop
procedure
opp
|
drop
procedure
opp
|
drop
procedure
ip
|
drop
procedure
ip
|
...
...
sql/item.cc
View file @
6822eb5e
...
@@ -171,6 +171,7 @@ bool Item::get_time(TIME *ltime)
...
@@ -171,6 +171,7 @@ bool Item::get_time(TIME *ltime)
CHARSET_INFO
*
Item
::
default_charset
()
const
CHARSET_INFO
*
Item
::
default_charset
()
const
{
{
return
current_thd
->
db_charset
;
return
current_thd
->
db_charset
;
}
Item
*
Item
*
...
...
sql/share/german/errmsg.txt
View file @
6822eb5e
...
@@ -259,13 +259,12 @@
...
@@ -259,13 +259,12 @@
"Referenz '%-.64s' wird nicht unterstützt (%s)",
"Referenz '%-.64s' wird nicht unterstützt (%s)",
"Für jede abgeleitete Tabelle muss ein eigener Alias angegeben werden.",
"Für jede abgeleitete Tabelle muss ein eigener Alias angegeben werden.",
"Select %u wurde während der Optimierung reduziert.",
"Select %u wurde während der Optimierung reduziert.",
"Tabelle '%-.64s', die in einem der SELECT-Befehle verwendet wurde kann nicht in %-.32s verwendet werden
."
"Tabelle '%-.64s', die in einem der SELECT-Befehle verwendet wurde kann nicht in %-.32s verwendet werden
",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL"
"All parts of a SPATIAL KEY must be NOT NULL"
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already running"
"The slave was already stopped"
"The slave was already stopped"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"Can't create a %s from within another stored routine"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s already exists"
"%s %s does not exist"
"%s %s does not exist"
...
...
sql/sp_pcontext.cc
View file @
6822eb5e
...
@@ -61,13 +61,17 @@ sp_pcontext::grow()
...
@@ -61,13 +61,17 @@ sp_pcontext::grow()
sp_pvar_t
*
sp_pvar_t
*
sp_pcontext
::
find_pvar
(
LEX_STRING
*
name
)
sp_pcontext
::
find_pvar
(
LEX_STRING
*
name
)
{
{
String
n
(
name
->
str
,
name
->
length
,
default_charset_info
);
uint
i
=
m_i
;
uint
i
=
m_i
;
while
(
i
--
>
0
)
while
(
i
--
>
0
)
{
{
if
(
stringcmp
(
&
n
,
m_pvar
[
i
].
name
->
const_string
())
==
0
)
if
(
my_strncasecmp
(
system_charset_info
,
name
->
str
,
m_pvar
[
i
].
name
->
const_string
()
->
ptr
(),
name
->
length
)
==
0
)
{
return
m_pvar
+
i
;
return
m_pvar
+
i
;
}
}
}
return
NULL
;
return
NULL
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment