diff options
| author | unknown <monty@mysql.com> | 2004-03-18 00:16:04 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-18 00:16:04 +0200 |
| commit | 24148f04c736679a69fd305270617616906f3697 (patch) | |
| tree | 2bd46f92f467b68e9b652a280b512a9cf0413ca2 /client/mysql.cc | |
| parent | 7395d54d5b59d9615773c1300953df3b225b0027 (diff) | |
| parent | 022c5241a9ebcd6047b761ef437f51e62722f9e9 (diff) | |
| download | mariadb-git-24148f04c736679a69fd305270617616906f3697.tar.gz | |
merge fixes (use old code)
client/mysqladmin.c:
Auto merged
client/mysqltest.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/os0file.h:
Auto merged
innobase/os/os0file.c:
Auto merged
myisam/mi_check.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 82925400c44..31f563d4116 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3183,6 +3183,8 @@ static const char* construct_prompt() processed_prompt.append(' '); break; case 'R': + if (t->tm_hour < 10) + processed_prompt.append('0'); add_int_to_prompt(t->tm_hour); break; case 'r': @@ -3190,6 +3192,8 @@ static const char* construct_prompt() getHour = t->tm_hour % 12; if (getHour == 0) getHour=12; + if (getHour < 10) + processed_prompt.append('0'); add_int_to_prompt(getHour); break; case 'm': @@ -3215,6 +3219,8 @@ static const char* construct_prompt() processed_prompt.append(strtok(dateTime,"\n")); break; case 's': + if (t->tm_sec < 10) + processed_prompt.append('0'); add_int_to_prompt(t->tm_sec); break; case 'w': |