mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Cleaner implementation if INSERT ... SELECT with same tables
Tests cleanup (put drop database first in tests)
This commit is contained in:
@@ -2592,14 +2592,11 @@ static void mysql_end_timer(ulong start_time,char *buff)
|
||||
|
||||
static const char* construct_prompt()
|
||||
{
|
||||
//erase the old prompt
|
||||
if (!mysql_get_host_info(&mysql))
|
||||
return processed_prompt.ptr();
|
||||
processed_prompt.free();
|
||||
//get the date struct
|
||||
time_t lclock = time(NULL);
|
||||
processed_prompt.free(); // Erase the old prompt
|
||||
time_t lclock = time(NULL); // Get the date struct
|
||||
struct tm *t = localtime(&lclock);
|
||||
//parse thru the settings for the prompt
|
||||
|
||||
/* parse thru the settings for the prompt */
|
||||
for (char *c = current_prompt; *c ; *c++)
|
||||
{
|
||||
if (*c != PROMPT_CHAR)
|
||||
@@ -2608,8 +2605,7 @@ static const char* construct_prompt()
|
||||
{
|
||||
switch (*++c) {
|
||||
case '\0':
|
||||
//stop it from going beyond if ends with %
|
||||
c--;
|
||||
c--; // stop it from going beyond if ends with %
|
||||
break;
|
||||
case 'c':
|
||||
add_int_to_prompt(++prompt_counter);
|
||||
|
Reference in New Issue
Block a user