Commit 7a5d0c2e authored by unknown's avatar unknown

Maria - Fixes to help some pushbuild hosts compile.


include/Makefile.am:
  put my_bit.h in the tarball (need it for mf_keycache.c)
mysys/lf_alloc-pin.c:
  // in .c file
mysys/lf_hash.c:
  // in .c file
parent de6f550e
...@@ -23,7 +23,7 @@ pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ ...@@ -23,7 +23,7 @@ pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
mysql_time.h mysql/plugin.h $(BUILT_SOURCES) mysql_time.h mysql/plugin.h $(BUILT_SOURCES)
noinst_HEADERS = config-win.h config-netware.h lf.h \ noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \
heap.h maria.h myisamchk.h my_bitmap.h my_uctype.h \ heap.h maria.h myisamchk.h my_bitmap.h my_uctype.h \
myisam.h myisampack.h myisammrg.h ft_global.h\ myisam.h myisampack.h myisammrg.h ft_global.h\
mysys_err.h my_base.h help_start.h help_end.h \ mysys_err.h my_base.h help_start.h help_end.h \
......
// TODO multi-pinbox #warning TODO multi-pinbox
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
......
...@@ -85,7 +85,8 @@ static int lfind(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr, ...@@ -85,7 +85,8 @@ static int lfind(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr,
{ {
if (!cursor->curr) if (!cursor->curr)
return 0; return 0;
do { // XXX or goto retry ? do {
#warning XXX or goto retry ?
link= cursor->curr->link; link= cursor->curr->link;
cursor->next= PTR(link); cursor->next= PTR(link);
_lf_pin(pins, 0, cursor->next); _lf_pin(pins, 0, cursor->next);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment