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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
adea21fd
Commit
adea21fd
authored
Oct 13, 2006
by
cmiller@zippy.cornsilk.net
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge fix-up.
parent
87ba07e8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
sql/sql_view.cc
sql/sql_view.cc
+14
-1
vio/viossl.c
vio/viossl.c
+2
-2
No files found.
sql/sql_view.cc
View file @
adea21fd
...
@@ -573,6 +573,19 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
...
@@ -573,6 +573,19 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
}
}
append_identifier
(
thd
,
&
buff
,
views
->
table_name
,
append_identifier
(
thd
,
&
buff
,
views
->
table_name
,
views
->
table_name_length
);
views
->
table_name_length
);
if
(
lex
->
view_list
.
elements
)
{
List_iterator_fast
<
LEX_STRING
>
names
(
lex
->
view_list
);
LEX_STRING
*
name
;
int
i
;
for
(
i
=
0
;
name
=
names
++
;
i
++
)
{
buff
.
append
(
i
?
", "
:
"("
);
append_identifier
(
thd
,
&
buff
,
name
->
str
,
name
->
length
);
}
buff
.
append
(
')'
);
}
buff
.
append
(
STRING_WITH_LEN
(
" AS "
));
buff
.
append
(
STRING_WITH_LEN
(
" AS "
));
buff
.
append
(
views
->
source
.
str
,
views
->
source
.
length
);
buff
.
append
(
views
->
source
.
str
,
views
->
source
.
length
);
...
@@ -1378,7 +1391,7 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
...
@@ -1378,7 +1391,7 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
error
=
TRUE
;
error
=
TRUE
;
query_cache_invalidate3
(
thd
,
view
,
0
);
query_cache_invalidate3
(
thd
,
view
,
0
);
sp_cache_invalidate
();
sp_cache_invalidate
();
}
if
(
mysql_bin_log
.
is_open
())
if
(
mysql_bin_log
.
is_open
())
{
{
thd
->
clear_error
();
thd
->
clear_error
();
...
...
vio/viossl.c
View file @
adea21fd
...
@@ -82,7 +82,7 @@ int vio_ssl_read(Vio *vio, gptr buf, int size)
...
@@ -82,7 +82,7 @@ int vio_ssl_read(Vio *vio, gptr buf, int size)
{
{
int
r
;
int
r
;
DBUG_ENTER
(
"vio_ssl_read"
);
DBUG_ENTER
(
"vio_ssl_read"
);
DBUG_PRINT
(
"enter"
,
(
"sd: %d, buf: 0x%
p, size: %d, ssl_: 0x%p
"
,
DBUG_PRINT
(
"enter"
,
(
"sd: %d, buf: 0x%
lx, size: %d, ssl_: 0x%lx
"
,
vio
->
sd
,
buf
,
size
,
vio
->
ssl_arg
));
vio
->
sd
,
buf
,
size
,
vio
->
ssl_arg
));
r
=
SSL_read
((
SSL
*
)
vio
->
ssl_arg
,
buf
,
size
);
r
=
SSL_read
((
SSL
*
)
vio
->
ssl_arg
,
buf
,
size
);
...
@@ -99,7 +99,7 @@ int vio_ssl_write(Vio *vio, const gptr buf, int size)
...
@@ -99,7 +99,7 @@ int vio_ssl_write(Vio *vio, const gptr buf, int size)
{
{
int
r
;
int
r
;
DBUG_ENTER
(
"vio_ssl_write"
);
DBUG_ENTER
(
"vio_ssl_write"
);
DBUG_PRINT
(
"enter"
,
(
"sd: %d, buf: 0x%
p
, size: %d"
,
vio
->
sd
,
buf
,
size
));
DBUG_PRINT
(
"enter"
,
(
"sd: %d, buf: 0x%
lx
, size: %d"
,
vio
->
sd
,
buf
,
size
));
r
=
SSL_write
((
SSL
*
)
vio
->
ssl_arg
,
buf
,
size
);
r
=
SSL_write
((
SSL
*
)
vio
->
ssl_arg
,
buf
,
size
);
#ifndef DBUG_OFF
#ifndef DBUG_OFF
...
...
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