diff options
| author | monty@mysql.com <> | 2004-06-01 23:39:39 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-06-01 23:39:39 +0300 |
| commit | 53d05f4adbf21f70fde5d552321033792479c6f1 (patch) | |
| tree | e6638a944a24b46bb485e09bf3ec6613ab1dfd0d | |
| parent | 197fcf1ee4b1c0af33fb7386fa88f8393b042773 (diff) | |
| download | mariadb-git-53d05f4adbf21f70fde5d552321033792479c6f1.tar.gz | |
Removed compiler warnings
| -rw-r--r-- | libmysqld/Makefile.am | 1 | ||||
| -rw-r--r-- | mysql-test/r/func_gconcat.result | 2 | ||||
| -rw-r--r-- | sql/share/romanian/errmsg.txt | 2 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 9 |
4 files changed, 8 insertions, 6 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index e258b10c6e6..b165d7f457b 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -22,7 +22,6 @@ MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ - -DNO_EMBEDDED_ACCESS_CHECKS \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result index 60a28e5018f..43bcf94d6d9 100644 --- a/mysql-test/r/func_gconcat.result +++ b/mysql-test/r/func_gconcat.result @@ -172,7 +172,7 @@ create table t1 ( URL_ID int(11), URL varchar(80)); create table t2 ( REQ_ID int(11), URL_ID int(11)); insert into t1 values (4,'www.host.com'), (5,'www.google.com'),(5,'www.help.com'); insert into t2 values (1,4), (5,4), (5,5); -select REQ_ID, Group_Concat(URL) as URL from t1, t2 where +select REQ_ID, Group_Concat(URL) as URL from t1, t2 where t2.URL_ID = t1.URL_ID group by REQ_ID; REQ_ID URL 1 X diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index e9aa81717cb..b013aa1f109 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -192,7 +192,7 @@ character-set=latin2 "Got error %d during FLUSH_LOGS", "Got error %d during CHECKPOINT", "Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)", -"The handler for the table does not support binary table dump","Binlog closed while trying to FLUSH MASTER", +"The handler for the table does not support binary table dump", "Binlog closed while trying to FLUSH MASTER", "Failed rebuilding the index of dumped table '%-.64s'", "Error from master: '%-.64s'", diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 5b1b18e80e4..037dd99d3b6 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1199,7 +1199,8 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) /* request for new delayed insert */ if (!(thd->lock=mysql_lock_tables(thd,&di->table,1))) { - di->dead=thd->killed=1; // Fatal error + di->dead= 1; // Some fatal error + thd->killed= 1; } pthread_cond_broadcast(&di->cond_client); } @@ -1207,7 +1208,8 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) { if (di->handle_inserts()) { - di->dead=thd->killed=1; // Some fatal error + di->dead= 1; // Some fatal error + thd->killed= 1; } } di->status=0; @@ -1234,7 +1236,8 @@ end: close_thread_tables(thd); // Free the table di->table=0; - di->dead=thd->killed=1; // If error + di->dead= 1; // If error + thd->killed= 1; pthread_cond_broadcast(&di->cond_client); // Safety pthread_mutex_unlock(&di->mutex); |