mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix after merge

Browse source 
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
This commit is contained in:
unknown 2002-08-08 16:41:04 +03:00
commit 028cfaba9b
9 changed files with 109 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libmysqld/lib_vio.c
View file

@ -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);
}