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
cc9f3328
Commit
cc9f3328
authored
18 years ago
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents
12a47bf2
e1b8982e
Branches unavailable
Tags unavailable
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
15 deletions
+25
-15
config/ac-macros/ssl.m4
config/ac-macros/ssl.m4
+12
-2
sql/sql_insert.cc
sql/sql_insert.cc
+13
-13
No files found.
config/ac-macros/ssl.m4
View file @
cc9f3328
...
...
@@ -23,7 +23,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
extra/yassl/src/Makefile dnl
extra/yassl/testsuite/Makefile)
with_yassl="yes"
with_
bundled_
yassl="yes"
yassl_dir="yassl"
AC_SUBST([yassl_dir])
...
...
@@ -174,6 +174,16 @@ AC_MSG_CHECKING(for SSL)
[mysql_ssl_dir="$withval"],
[mysql_ssl_dir=no])
if test "$with_yassl"
then
AC_MSG_ERROR([The flag --with-yassl is deprecated, use --with-ssl])
fi
if test "$with_openssl"
then
AC_MSG_ERROR([The flag --with-openssl is deprecated, use --with-ssl])
fi
case "$mysql_ssl_dir" in
"no")
#
...
...
@@ -196,5 +206,5 @@ AC_MSG_CHECKING(for SSL)
MYSQL_FIND_OPENSSL([$mysql_ssl_dir])
;;
esac
AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ])
AM_CONDITIONAL([HAVE_YASSL], [ test "$with_
bundled_
yassl" = "yes" ])
])
This diff is collapsed.
Click to expand it.
sql/sql_insert.cc
View file @
cc9f3328
...
...
@@ -2674,24 +2674,24 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
}
class
MY_HOOKS
:
public
TABLEOP_HOOKS
{
public:
MY_HOOKS
(
select_create
*
x
)
:
ptr
(
x
)
{
}
virtual
void
do_prelock
(
TABLE
**
tables
,
uint
count
)
{
if
(
ptr
->
get_thd
()
->
current_stmt_binlog_row_based
)
ptr
->
binlog_show_create_table
(
tables
,
count
);
}
private:
select_create
*
ptr
;
};
int
select_create
::
prepare
(
List
<
Item
>
&
values
,
SELECT_LEX_UNIT
*
u
)
{
DBUG_ENTER
(
"select_create::prepare"
);
class
MY_HOOKS
:
public
TABLEOP_HOOKS
{
public:
MY_HOOKS
(
select_create
*
x
)
:
ptr
(
x
)
{
}
virtual
void
do_prelock
(
TABLE
**
tables
,
uint
count
)
{
if
(
ptr
->
get_thd
()
->
current_stmt_binlog_row_based
)
ptr
->
binlog_show_create_table
(
tables
,
count
);
}
private:
select_create
*
ptr
;
};
MY_HOOKS
hooks
(
this
);
unit
=
u
;
...
...
This diff is collapsed.
Click to expand it.
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