diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-14 09:53:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-14 09:53:19 +0200 |
| commit | 1b5f0cbd465f92ffc278a924e765e41413d97420 (patch) | |
| tree | 0f386de98c507aca6127d3134ce58f428e63d283 /mysys | |
| parent | 701e22d5cd6642e803cfca2443c522a2998e3047 (diff) | |
| parent | 806380494353bb1389507def0256b3308e5cedbb (diff) | |
| download | mariadb-git-1b5f0cbd465f92ffc278a924e765e41413d97420.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/ma_dyncol.c | 3 | ||||
| -rw-r--r-- | mysys/thr_alarm.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index 125b3a4632d..3c15e373182 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -4183,8 +4183,7 @@ mariadb_dyncol_json_internal(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json, } else { - if ((rc= mariadb_dyncol_val_str(json, &val, - &my_charset_utf8_general_ci, '"')) < 0) + if ((rc= mariadb_dyncol_val_str(json, &val, DYNCOL_UTF, '"')) < 0) goto err; } } diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 9d917d3dd59..61ef3657161 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -273,7 +273,7 @@ void thr_end_alarm(thr_alarm_t *alarmed) /* Come here when some alarm in queue is due. Mark all alarms with are finnished in list. - Shedule alarms to be sent again after 1-10 sec (many alarms at once) + Schedule alarms to be sent again after 1-10 sec (many alarms at once) If alarm_aborted is set then all alarms are given and resent every second. */ @@ -425,7 +425,7 @@ void end_thr_alarm(my_bool free_structures) if (alarm_aborted != 1) /* If memory not freed */ { mysql_mutex_lock(&LOCK_alarm); - DBUG_PRINT("info",("Resheduling %d waiting alarms",alarm_queue.elements)); + DBUG_PRINT("info",("Rescheduling %d waiting alarms",alarm_queue.elements)); alarm_aborted= -1; /* mark aborted */ if (alarm_queue.elements || (alarm_thread_running && free_structures)) { |