mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into hundin.mysql.fi:/home/jan/mysql-4.1
This commit is contained in:
jan@hundin.mysql.fi 2005-04-19 13:59:09 +03:00
commit bd10055a7e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sql/ha_innodb.cc
View file

@ -5666,7 +5666,7 @@ prototype for this function ! */
ibool
innobase_query_is_update(void)
/*===========================*/
/*==========================*/
{
THD* thd;
@ -5676,15 +5676,15 @@ innobase_query_is_update(void)
thd->lex->sql_command == SQLCOM_REPLACE_SELECT ||
( thd->lex->sql_command == SQLCOM_LOAD &&
thd->lex->duplicates == DUP_REPLACE )) {
return true;
return(1);
}
if ( thd->lex->sql_command == SQLCOM_INSERT &&
thd->lex->duplicates == DUP_UPDATE ) {
return true;
return(1);
}
return false;
return(0);
}
}