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
ba1de166
Commit
ba1de166
authored
Feb 16, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-axmrg
parents
9d66be72
daf7790c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
0 deletions
+38
-0
mysql-test/r/keywords.result
mysql-test/r/keywords.result
+13
-0
mysql-test/t/keywords.test
mysql-test/t/keywords.test
+22
-0
mysys/my_thr_init.c
mysys/my_thr_init.c
+2
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+1
-0
No files found.
mysql-test/r/keywords.result
View file @
ba1de166
...
...
@@ -16,3 +16,16 @@ select events.binlog from events;
binlog
1
drop table events;
create table t1 (connection int, b int);
create procedure p1()
begin
declare connection int;
select max(t1.connection) into connection from t1;
select concat("max=",connection) 'p1';
end|
insert into t1 (connection) values (1);
call p1();
p1
max=1
drop procedure p1;
drop table t1;
mysql-test/t/keywords.test
View file @
ba1de166
...
...
@@ -19,3 +19,25 @@ select events.binlog from events;
drop
table
events
;
# End of 4.1 tests
#
# Bug#12204 - CONNECTION should not be a reserved word
#
create
table
t1
(
connection
int
,
b
int
);
delimiter
|
;
create
procedure
p1
()
begin
declare
connection
int
;
select
max
(
t1
.
connection
)
into
connection
from
t1
;
select
concat
(
"max="
,
connection
)
'p1'
;
end
|
delimiter
;
|
insert
into
t1
(
connection
)
values
(
1
);
call
p1
();
drop
procedure
p1
;
drop
table
t1
;
# End of 5.0 tests
mysys/my_thr_init.c
View file @
ba1de166
...
...
@@ -47,6 +47,8 @@ pthread_mutexattr_t my_fast_mutexattr;
pthread_mutexattr_t
my_errorcheck_mutexattr
;
#endif
uint
thd_lib_detected
;
#ifdef NPTL_PTHREAD_EXIT_BUG
/* see my_pthread.h */
/*
...
...
sql/sql_yacc.yy
View file @
ba1de166
...
...
@@ -7926,6 +7926,7 @@ keyword_sp:
| COMPACT_SYM {}
| COMPRESSED_SYM {}
| CONCURRENT {}
| CONNECTION_SYM {}
| CONSISTENT_SYM {}
| CUBE_SYM {}
| DATA_SYM {}
...
...
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