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
e7c78a04
Commit
e7c78a04
authored
18 years ago
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/home/jimw/my/mysql-5.1-clean
parents
9df9098e
ade3de74
Branches unavailable
Tags unavailable
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
22 deletions
+39
-22
config/ac-macros/ssl.m4
config/ac-macros/ssl.m4
+12
-2
sql/event_scheduler.cc
sql/event_scheduler.cc
+13
-6
sql/event_scheduler.h
sql/event_scheduler.h
+1
-1
sql/sql_insert.cc
sql/sql_insert.cc
+13
-13
No files found.
config/ac-macros/ssl.m4
View file @
e7c78a04
...
@@ -23,7 +23,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
...
@@ -23,7 +23,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
extra/yassl/src/Makefile dnl
extra/yassl/src/Makefile dnl
extra/yassl/testsuite/Makefile)
extra/yassl/testsuite/Makefile)
with_yassl="yes"
with_
bundled_
yassl="yes"
yassl_dir="yassl"
yassl_dir="yassl"
AC_SUBST([yassl_dir])
AC_SUBST([yassl_dir])
...
@@ -174,6 +174,16 @@ AC_MSG_CHECKING(for SSL)
...
@@ -174,6 +174,16 @@ AC_MSG_CHECKING(for SSL)
[mysql_ssl_dir="$withval"],
[mysql_ssl_dir="$withval"],
[mysql_ssl_dir=no])
[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
case "$mysql_ssl_dir" in
"no")
"no")
#
#
...
@@ -196,5 +206,5 @@ AC_MSG_CHECKING(for SSL)
...
@@ -196,5 +206,5 @@ AC_MSG_CHECKING(for SSL)
MYSQL_FIND_OPENSSL([$mysql_ssl_dir])
MYSQL_FIND_OPENSSL([$mysql_ssl_dir])
;;
;;
esac
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/event_scheduler.cc
View file @
e7c78a04
...
@@ -236,9 +236,16 @@
...
@@ -236,9 +236,16 @@
about conditional variables used.
about conditional variables used.
*/
*/
#ifdef __GNUC__
#if __GNUC__ >= 2
#define SCHED_FUNC __FUNCTION__
#endif
#else
#define SCHED_FUNC "<unknown>"
#endif
#define LOCK_SCHEDULER_DATA() lock_data(
__FUNCTION__,
__LINE__)
#define LOCK_SCHEDULER_DATA() lock_data(
SCHED_FUNC,
__LINE__)
#define UNLOCK_SCHEDULER_DATA() unlock_data(
__FUNCTION__,
__LINE__)
#define UNLOCK_SCHEDULER_DATA() unlock_data(
SCHED_FUNC,
__LINE__)
#ifndef DBUG_OFF
#ifndef DBUG_OFF
...
@@ -767,7 +774,7 @@ Event_scheduler::add_event(THD *thd, Event_timed *et, bool check_existence)
...
@@ -767,7 +774,7 @@ Event_scheduler::add_event(THD *thd, Event_timed *et, bool check_existence)
}
}
/* We need to load the event on scheduler_root */
/* We need to load the event on scheduler_root */
if
(
!
(
res
=
load_event
(
thd
,
et
,
&
et_new
)))
if
(
!
(
res
=
load_
named_
event
(
thd
,
et
,
&
et_new
)))
{
{
queue_insert_safe
(
&
queue
,
(
byte
*
)
et_new
);
queue_insert_safe
(
&
queue
,
(
byte
*
)
et_new
);
DBUG_PRINT
(
"info"
,
(
"Sending COND_new_work"
));
DBUG_PRINT
(
"info"
,
(
"Sending COND_new_work"
));
...
@@ -902,7 +909,7 @@ Event_scheduler::replace_event(THD *thd, Event_timed *et, LEX_STRING *new_schema
...
@@ -902,7 +909,7 @@ Event_scheduler::replace_event(THD *thd, Event_timed *et, LEX_STRING *new_schema
1. Error occured
1. Error occured
2. If the replace is DISABLED, we don't load it into the queue.
2. If the replace is DISABLED, we don't load it into the queue.
*/
*/
if
(
!
(
res
=
load_event
(
thd
,
et
,
&
et_new
)))
if
(
!
(
res
=
load_
named_
event
(
thd
,
et
,
&
et_new
)))
{
{
queue_insert_safe
(
&
queue
,
(
byte
*
)
et_new
);
queue_insert_safe
(
&
queue
,
(
byte
*
)
et_new
);
DBUG_PRINT
(
"info"
,
(
"Sending COND_new_work"
));
DBUG_PRINT
(
"info"
,
(
"Sending COND_new_work"
));
...
@@ -2025,7 +2032,7 @@ Event_scheduler::events_count()
...
@@ -2025,7 +2032,7 @@ Event_scheduler::events_count()
the table, compiles and inserts it into the cache.
the table, compiles and inserts it into the cache.
SYNOPSIS
SYNOPSIS
Event_scheduler::load_event()
Event_scheduler::load_
named_
event()
thd THD
thd THD
etn The name of the event to load and compile on scheduler's root
etn The name of the event to load and compile on scheduler's root
etn_new The loaded event
etn_new The loaded event
...
@@ -2036,7 +2043,7 @@ Event_scheduler::events_count()
...
@@ -2036,7 +2043,7 @@ Event_scheduler::events_count()
*/
*/
enum
Event_scheduler
::
enum_error_code
enum
Event_scheduler
::
enum_error_code
Event_scheduler
::
load_event
(
THD
*
thd
,
Event_timed
*
etn
,
Event_timed
**
etn_new
)
Event_scheduler
::
load_
named_
event
(
THD
*
thd
,
Event_timed
*
etn
,
Event_timed
**
etn_new
)
{
{
int
ret
=
0
;
int
ret
=
0
;
MEM_ROOT
*
tmp_mem_root
;
MEM_ROOT
*
tmp_mem_root
;
...
...
This diff is collapsed.
Click to expand it.
sql/event_scheduler.h
View file @
e7c78a04
...
@@ -152,7 +152,7 @@ class Event_scheduler
...
@@ -152,7 +152,7 @@ class Event_scheduler
stop_all_running_events
(
THD
*
thd
);
stop_all_running_events
(
THD
*
thd
);
enum
enum_error_code
enum
enum_error_code
load_event
(
THD
*
thd
,
Event_timed
*
etn
,
Event_timed
**
etn_new
);
load_
named_
event
(
THD
*
thd
,
Event_timed
*
etn
,
Event_timed
**
etn_new
);
int
int
load_events_from_db
(
THD
*
thd
);
load_events_from_db
(
THD
*
thd
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_insert.cc
View file @
e7c78a04
...
@@ -2674,13 +2674,8 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
...
@@ -2674,13 +2674,8 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
}
}
int
class
MY_HOOKS
:
public
TABLEOP_HOOKS
{
select_create
::
prepare
(
List
<
Item
>
&
values
,
SELECT_LEX_UNIT
*
u
)
public:
{
DBUG_ENTER
(
"select_create::prepare"
);
class
MY_HOOKS
:
public
TABLEOP_HOOKS
{
public:
MY_HOOKS
(
select_create
*
x
)
:
ptr
(
x
)
{
}
MY_HOOKS
(
select_create
*
x
)
:
ptr
(
x
)
{
}
virtual
void
do_prelock
(
TABLE
**
tables
,
uint
count
)
virtual
void
do_prelock
(
TABLE
**
tables
,
uint
count
)
{
{
...
@@ -2688,9 +2683,14 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
...
@@ -2688,9 +2683,14 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
ptr
->
binlog_show_create_table
(
tables
,
count
);
ptr
->
binlog_show_create_table
(
tables
,
count
);
}
}
private:
private:
select_create
*
ptr
;
select_create
*
ptr
;
};
};
int
select_create
::
prepare
(
List
<
Item
>
&
values
,
SELECT_LEX_UNIT
*
u
)
{
DBUG_ENTER
(
"select_create::prepare"
);
MY_HOOKS
hooks
(
this
);
MY_HOOKS
hooks
(
this
);
...
...
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