database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Removed compiler warnings

Browse Source
This commit is contained in:
monty@mysql.com
2004-06-01 23:39:39 +03:00
parent 197fcf1ee4
commit 53d05f4adb
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysqld/Makefile.am
View File

@ -22,7 +22,6 @@ MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
-DNO_EMBEDDED_ACCESS_CHECKS \
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" -DSHAREDIR="\"$(MYSQLSHAREdir)\""

2
mysql-test/r/func_gconcat.result
View File

@ -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)); 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 t1 values (4,'www.host.com'), (5,'www.google.com'),(5,'www.help.com');
insert into t2 values (1,4), (5,4), (5,5); 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; t2.URL_ID = t1.URL_ID group by REQ_ID;
REQ_ID URL REQ_ID URL
1 X 1 X

2
sql/share/romanian/errmsg.txt
View File

@ -192,7 +192,7 @@ character-set=latin2
"Got error %d during FLUSH_LOGS", "Got error %d during FLUSH_LOGS",
"Got error %d during CHECKPOINT", "Got error %d during CHECKPOINT",
"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)", "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", "Binlog closed while trying to FLUSH MASTER",
"Failed rebuilding the index of dumped table '%-.64s'", "Failed rebuilding the index of dumped table '%-.64s'",
"Error from master: '%-.64s'", "Error from master: '%-.64s'",

9
sql/sql_insert.cc
View File

@ -1199,7 +1199,8 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg)
/* request for new delayed insert */ /* request for new delayed insert */
if (!(thd->lock=mysql_lock_tables(thd,&di->table,1))) 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); pthread_cond_broadcast(&di->cond_client);
} }
@ -1207,7 +1208,8 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg)
{ {
if (di->handle_inserts()) if (di->handle_inserts())
{ {
di->dead=thd->killed=1; // Some fatal error di->dead= 1; // Some fatal error
thd->killed= 1;
} }
} }
di->status=0; di->status=0;
@ -1234,7 +1236,8 @@ end:
close_thread_tables(thd); // Free the table close_thread_tables(thd); // Free the table
di->table=0; 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_cond_broadcast(&di->cond_client); // Safety
pthread_mutex_unlock(&di->mutex); pthread_mutex_unlock(&di->mutex);