Commit e7c78a04 authored by jimw@mysql.com's avatar jimw@mysql.com

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
...@@ -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" ])
]) ])
...@@ -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;
......
...@@ -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);
......
...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment