Commit d11512cc authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

Merge mashka.mysql.fi:/home/my/mysql-3.23 

into mashka.mysql.fi:/home/my/mysql-4.0
parents 93e033fa fee5128d

Docs/manual.texi

+4 −0
Original line number Diff line number Diff line
@@ -51081,6 +51081,10 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.53

@itemize @bullet

@item

Changed @code{AND/OR} to report that they can return NULL. This fixes a

small problem in @code{GROUP BY} on @code{AND/OR} expression that return

@code{NULL}.

@item

Fixed a bug that @code{OPTIMIZE} of locked and modified MyISAM table,

reported table corruption.

@item

sql/mysql_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ bool rm_temporary_table(enum db_type base, char *path); 
bool send_fields(THD *thd,List<Item> &item,uint send_field_count);

void free_io_cache(TABLE *entry);

void intern_close_table(TABLE *entry);

bool close_thread_table(THD *thd, TABLE **table_ptr);

void close_thread_tables(THD *thd,bool locked=0);

bool close_thread_table(THD *thd, TABLE **table_ptr);

void close_temporary_tables(THD *thd);

sql/sql_table.cc

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 


#include "mysql_priv.h"

#include <hash.h>

#ifdef HAVE_BERKELEY_DB

#include <ha_berkeley.h>

#endif

#include <myisam.h>

#ifdef HAVE_BERKELEY_DB

#include <ha_berkeley.h>