diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-03 10:36:23 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-03 10:36:23 +0100 |
| commit | 4d7f0735067260bfc600c85e1574b7c708180fc2 (patch) | |
| tree | 80a3c2f394e0ba6ed00d52063fd6627cb85d1945 | |
| parent | faf2a6e5f03b9c7bd52d838b2a9b4860c3b65bee (diff) | |
| parent | 3c94c5b8fab0c3bb0febe62d72b89bc8d51c3932 (diff) | |
| download | mariadb-git-4d7f0735067260bfc600c85e1574b7c708180fc2.tar.gz | |
Merge branch '5.5' into 10.1
| -rw-r--r-- | mysql-test/r/events_bugs.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/events_bugs.test | 4 | ||||
| -rw-r--r-- | sql/threadpool_unix.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result index a873a28faed..a05a9383980 100644 --- a/mysql-test/r/events_bugs.result +++ b/mysql-test/r/events_bugs.result @@ -684,7 +684,7 @@ SET GLOBAL READ_ONLY = 1; # Connection: u1_con (mysqltest_u1@localhost/events_test). # -CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; +CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement ALTER EVENT e1 COMMENT 'comment'; @@ -697,7 +697,7 @@ ERROR HY000: The MariaDB server is running with the --read-only option so it can # Connection: root_con (root@localhost/events_test). # -CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; +CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test index cace397e92a..817ead49b33 100644 --- a/mysql-test/t/events_bugs.test +++ b/mysql-test/t/events_bugs.test @@ -1034,7 +1034,7 @@ SET GLOBAL READ_ONLY = 1; --echo --error ER_OPTION_PREVENTS_STATEMENT -CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; +CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; --echo @@ -1058,7 +1058,7 @@ DROP EVENT e1; --echo -CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; +CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; --echo diff --git a/sql/threadpool_unix.cc b/sql/threadpool_unix.cc index d4ee3afc4fe..fdab7df2529 100644 --- a/sql/threadpool_unix.cc +++ b/sql/threadpool_unix.cc @@ -1176,7 +1176,7 @@ void wait_begin(thread_group_t *thread_group) DBUG_ASSERT(thread_group->connection_count > 0); if ((thread_group->active_thread_count == 0) && - (thread_group->queue.is_empty() || !thread_group->listener)) + (!thread_group->queue.is_empty() || !thread_group->listener)) { /* Group might stall while this thread waits, thus wake |