Commit 1489c417 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/new-fix 

into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents 85ce9919 d93ff572

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -922,3 +922,4 @@ Docs/Images/mydsn-test-success.txt 
Docs/Images/mydsn-trace.txt

Docs/Images/mydsn.txt

Docs/Images/myflowchart.txt

mysql-test/mysql_test_run_new

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ kaj@work.mysql.com 
kent@mysql.com

konstantin@mysql.com

kostja@oak.local

lars@mysql.com

lenz@kallisto.mysql.com

lenz@mysql.com

magnus@neptunus.(none)

Docs/Images/Makefile.am

0 → 100644
+35 −0
Original line number Diff line number Diff line 
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB

#

# This library is free software; you can redistribute it and/or

# modify it under the terms of the GNU Library General Public

# License as published by the Free Software Foundation; either

# version 2 of the License, or (at your option) any later version.

#

# This library is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

# Library General Public License for more details.

#

# You should have received a copy of the GNU Library General Public

# License along with this library; if not, write to the Free

# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

# MA 02111-1307, USA



## Process this file with automake to create Makefile.in



# This is a dummy file to satisfy the hierarchy of Makefiles.

# When a release is built, the true Makefile will be copied 

# together with the "real" files in this directory.



EXTRA_DIST =		



# Nothing to create in this dummy directory.

all:

	:



# Nothing to cleanup in this dummy directory.

clean:

	:



# Don't update the files from bitkeeper

%::SCCS/s.%

acinclude.m4

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ INCLUDES="$INCLUDES $ZLIB_INCLUDES" 
LIBS="$LIBS $ZLIB_LIBS"

AC_CACHE_VAL([mysql_cv_compress],

  [AC_TRY_LINK([#include <zlib.h>],

    [int link_test() { return compress(0, (unsigned long*) 0, "", 0); }],

    [return compress(0, (unsigned long*) 0, "", 0);],

    [mysql_cv_compress="yes"

    AC_MSG_RESULT([ok])],

    [mysql_cv_compress="no"])

client/mysqladmin.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static const char *command_names[]= { 
};



static TYPELIB command_typelib=

{ array_elements(command_names)-1,"commands", command_names};

{ array_elements(command_names)-1,"commands", command_names, NULL};



static struct my_option my_long_options[] =

{