diff options
| author | monty@mysql.com <> | 2004-04-05 13:56:05 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-04-05 13:56:05 +0300 |
| commit | 42cf92ce37c7ce9b7356d04273a858a9e42823b5 (patch) | |
| tree | 0bfd237ce668df7f8a361ddbc36762c5a16b2bae /sql/derror.cc | |
| parent | 99f712a30bc6fcdb5a71cf349243295458d22074 (diff) | |
| download | mariadb-git-42cf92ce37c7ce9b7356d04273a858a9e42823b5.tar.gz | |
Fixed many compiler warnings
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319)
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
Diffstat (limited to 'sql/derror.cc')
| -rw-r--r-- | sql/derror.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/derror.cc b/sql/derror.cc index 53d0dc5b7e5..09f43d20044 100644 --- a/sql/derror.cc +++ b/sql/derror.cc @@ -50,7 +50,7 @@ static bool read_texts(const char *file_name,const char ***point, char name[FN_REFLEN]; const char *buff; uchar head[32],*pos; - CHARSET_INFO *cset; + CHARSET_INFO *cset; // For future DBUG_ENTER("read_texts"); *point=0; // If something goes wrong @@ -137,7 +137,7 @@ err1: if (file != FERR) VOID(my_close(file,MYF(MY_WME))); unireg_abort(1); - DBUG_RETURN(1); // Impossible + DBUG_RETURN(1); // keep compiler happy } /* read_texts */ |