summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-08-08 16:41:04 +0300
committerunknown <monty@hundin.mysql.fi>2002-08-08 16:41:04 +0300
commit028cfaba9ba0fcbba30511e6951daab6a1829f20 (patch)
tree8abd660ca8962e8c1a9aa58dbabd22e3c2e6f163 /libmysqld
parent267b80834ad524c0d72976bc71e5b5bc9815ea1a (diff)
downloadmariadb-git-028cfaba9ba0fcbba30511e6951daab6a1829f20.tar.gz
Fix after merge
Updated WEEK() and DATE information in the manual. Docs/manual.texi: Updated WEEK() information. Added more information of how MySQL stores dates. libmysql/Makefile.am: Fix after merge libmysqld/lib_vio.c: Use new vio_blocking() mysql-test/r/group_by.result: Update results after merge sql/ha_innodb.cc: Fix after merge sql/lex.h: Fix after merge sql/slave.cc: Added missing include file sql/sql_base.cc: Added function comments vio/test-ssl.c: Fix after merge
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_vio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_vio.c b/libmysqld/lib_vio.c
index 5460c546faa..29a70b7acbb 100644
--- a/libmysqld/lib_vio.c
+++ b/libmysqld/lib_vio.c
@@ -151,7 +151,7 @@ int vio_write(Vio * vio, const gptr buf, int size)
DBUG_RETURN(size);
}
-int vio_blocking(Vio * vio, my_bool set_blocking_mode)
+int vio_blocking(Vio * vio, my_bool set_blocking_mode, my_bool *old_mode)
{
return (0);
}