Commit 6d9f6378 authored by unknown's avatar unknown
Browse files

Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/os/os0file.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
parents 8dc27f1e 8870b671

.bzrignore

+93 −93
Original line number Diff line number Diff line
@@ -45,6 +45,19 @@ COPYING 
COPYING.LIB

Docs/#manual.texi#

Docs/INSTALL-BINARY

Docs/Images/myaccess-odbc.txt

Docs/Images/myaccess.txt

Docs/Images/myarchitecture.txt

Docs/Images/mydll-properties.txt

Docs/Images/mydsn-example.txt

Docs/Images/mydsn-icon.txt

Docs/Images/mydsn-options.txt

Docs/Images/mydsn-setup.txt

Docs/Images/mydsn-test-fail.txt

Docs/Images/mydsn-test-success.txt

Docs/Images/mydsn-trace.txt

Docs/Images/mydsn.txt

Docs/Images/myflowchart.txt

Docs/include.texi

Docs/internals.html

Docs/internals.info
@@ -88,7 +101,9 @@ Makefile.in 
Makefile.in'

PENDING/*

TAGS

ac_available_languages_fragment

aclocal.m4

analyse.test

autom4te-2.53.cache/output.0

autom4te-2.53.cache/requests

autom4te-2.53.cache/traces.0
@@ -241,6 +256,7 @@ client/mf_iocache.c 
client/mf_iocache.cc

client/mysql

client/mysqladmin

client/mysqladmin.c

client/mysqlbinlog

client/mysqlcheck

client/mysqldump
@@ -287,6 +303,7 @@ gmon.out 
hardcopy.0

heap/hp_test1

heap/hp_test2

help

help.c

help.h

include/my_config.h
@@ -355,7 +372,9 @@ libmysqld/field_conv.cc 
libmysqld/filesort.cc

libmysqld/get_password.c

libmysqld/gstream.cc

libmysqld/ha_archive.cc

libmysqld/ha_berkeley.cc

libmysqld/ha_example.cc

libmysqld/ha_heap.cc

libmysqld/ha_innobase.cc

libmysqld/ha_innodb.cc
@@ -363,6 +382,7 @@ libmysqld/ha_isam.cc 
libmysqld/ha_isammrg.cc

libmysqld/ha_myisam.cc

libmysqld/ha_myisammrg.cc

libmysqld/ha_tina.cc

libmysqld/handler.cc

libmysqld/hash_filo.cc

libmysqld/hostname.cc
@@ -492,15 +512,71 @@ myisam/test2.MYD 
myisam/test2.MYI

mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz

mysql-4.0.2-alpha.tar.gz

mysql-4.1.8-win-src.zip

mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz

mysql-test/gmon.out

mysql-test/install_test_db

mysql-test/mysql-test-run

mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster

mysql-test/r/*.reject

mysql-test/r/alter_table.err

mysql-test/r/archive.err

mysql-test/r/bdb-alter-table-1.err

mysql-test/r/bdb-alter-table-2.err

mysql-test/r/bdb-crash.err

mysql-test/r/bdb-deadlock.err

mysql-test/r/bdb.err

mysql-test/r/bdb_cache.err

mysql-test/r/client_test.err

mysql-test/r/csv.err

mysql-test/r/ctype_ucs.err

mysql-test/r/derived.err

mysql-test/r/exampledb.err

mysql-test/r/func_encrypt.err

mysql-test/r/isam.err

mysql-test/r/lowercase_table2.err

mysql-test/r/multi_update.err

mysql-test/r/mysql_protocols.err

mysql-test/r/mysqlbinlog.err

mysql-test/r/mysqlbinlog2.err

mysql-test/r/mysqldump.err

mysql-test/r/mysqltest.err

mysql-test/r/ndb_alter_table.err

mysql-test/r/ndb_autodiscover.err

mysql-test/r/ndb_autodiscover2.err

mysql-test/r/ndb_basic.err

mysql-test/r/ndb_blob.err

mysql-test/r/ndb_cache.err

mysql-test/r/ndb_charset.err

mysql-test/r/ndb_index.err

mysql-test/r/ndb_index_ordered.err

mysql-test/r/ndb_index_unique.err

mysql-test/r/ndb_insert.err

mysql-test/r/ndb_limit.err

mysql-test/r/ndb_lock.err

mysql-test/r/ndb_minmax.err

mysql-test/r/ndb_replace.err

mysql-test/r/ndb_subquery.err

mysql-test/r/ndb_transaction.err

mysql-test/r/ndb_truncate.err

mysql-test/r/ndb_types.err

mysql-test/r/ndb_update.err

mysql-test/r/openssl_1.err

mysql-test/r/ps_1general.err

mysql-test/r/ps_6bdb.err

mysql-test/r/ps_7ndb.err

mysql-test/r/query_cache.err

mysql-test/r/query_cache_merge.err

mysql-test/r/raid.err

mysql-test/r/repair.err

mysql-test/r/replace.err

mysql-test/r/rpl000001.err

mysql-test/r/rpl000001.eval

mysql-test/r/rpl000002.eval

mysql-test/r/rpl000014.eval

mysql-test/r/rpl000015.err

mysql-test/r/rpl000015.eval

mysql-test/r/rpl000016.eval

mysql-test/r/rpl_log.eval
@@ -641,6 +717,8 @@ ndb/examples/ndbapi_example2/ndbapi_example2 
ndb/examples/ndbapi_example3/ndbapi_example3

ndb/examples/ndbapi_example5/ndbapi_example5

ndb/examples/select_all/select_all

ndb/include/ndb_global.h

ndb/include/ndb_version.h

ndb/lib/libMGM_API.so

ndb/lib/libNDB_API.so

ndb/lib/libNDB_ODBC.so
@@ -711,10 +789,25 @@ ndb/tools/ndb_delete_all 
ndb/tools/ndb_desc

ndb/tools/ndb_drop_index

ndb/tools/ndb_drop_table

ndb/tools/ndb_restore

ndb/tools/ndb_select_all

ndb/tools/ndb_select_count

ndb/tools/ndb_show_tables

ndb/tools/ndb_test_platform

ndb/tools/ndb_waiter

ndbcluster-1186

ndbcluster-1186/SCCS

ndbcluster-1186/config.ini

ndbcluster-1186/ndb_1.pid

ndbcluster-1186/ndb_1_out.log

ndbcluster-1186/ndb_1_signal.log

ndbcluster-1186/ndb_2.pid

ndbcluster-1186/ndb_2_out.log

ndbcluster-1186/ndb_2_signal.log

ndbcluster-1186/ndb_3.pid

ndbcluster-1186/ndb_3_cluster.log

ndbcluster-1186/ndb_3_out.log

ndbcluster-1186/ndbcluster.pid

pull.log

regex/re

repl-tests/test-repl-ts/repl-timestamp.master.reject
@@ -909,96 +1002,3 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl
 
Docs/Images/myaccess-odbc.txt

Docs/Images/myaccess.txt

Docs/Images/myarchitecture.txt

Docs/Images/mydll-properties.txt

Docs/Images/mydsn-example.txt

Docs/Images/mydsn-icon.txt

Docs/Images/mydsn-options.txt

Docs/Images/mydsn-setup.txt

Docs/Images/mydsn-test-fail.txt

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

ndb/tools/ndb_test_platform

help

ndbcluster-1186

ndbcluster-1186/SCCS

ndbcluster-1186/config.ini

ndbcluster-1186/ndb_1.pid

ndbcluster-1186/ndb_1_out.log

ndbcluster-1186/ndb_1_signal.log

ndbcluster-1186/ndb_2.pid

ndbcluster-1186/ndb_2_out.log

ndbcluster-1186/ndb_2_signal.log

ndbcluster-1186/ndb_3.pid

ndbcluster-1186/ndb_3_cluster.log

ndbcluster-1186/ndb_3_out.log

ndbcluster-1186/ndbcluster.pid

ndb/tools/ndb_restore

ac_available_languages_fragment

libmysqld/ha_archive.cc

libmysqld/ha_example.cc

libmysqld/ha_tina.cc

analyse.test

client/mysqladmin.c

mysql-4.1.8-win-src.zip

ndb/include/ndb_version.h

ndb/include/ndb_global.h

mysql-test/mysql-test-run.log

mysql-test/r/alter_table.err

mysql-test/r/archive.err

mysql-test/r/bdb-alter-table-1.err

mysql-test/r/bdb-alter-table-2.err

mysql-test/r/bdb-crash.err

mysql-test/r/bdb-deadlock.err

mysql-test/r/bdb.err

mysql-test/r/bdb_cache.err

mysql-test/r/client_test.err

mysql-test/r/csv.err

mysql-test/r/ctype_ucs.err

mysql-test/r/derived.err

mysql-test/r/exampledb.err

mysql-test/r/func_encrypt.err

mysql-test/r/isam.err

mysql-test/r/lowercase_table2.err

mysql-test/r/multi_update.err

mysql-test/r/mysql_protocols.err

mysql-test/r/mysqlbinlog.err

mysql-test/r/mysqlbinlog2.err

mysql-test/r/mysqldump.err

mysql-test/r/mysqltest.err

mysql-test/r/ndb_alter_table.err

mysql-test/r/ndb_autodiscover.err

mysql-test/r/ndb_autodiscover2.err

mysql-test/r/ndb_basic.err

mysql-test/r/ndb_blob.err

mysql-test/r/ndb_cache.err

mysql-test/r/ndb_charset.err

mysql-test/r/ndb_index.err

mysql-test/r/ndb_index_ordered.err

mysql-test/r/ndb_index_unique.err

mysql-test/r/ndb_insert.err

mysql-test/r/ndb_limit.err

mysql-test/r/ndb_lock.err

mysql-test/r/ndb_minmax.err

mysql-test/r/ndb_replace.err

mysql-test/r/ndb_subquery.err

mysql-test/r/ndb_transaction.err

mysql-test/r/ndb_truncate.err

mysql-test/r/ndb_types.err

mysql-test/r/ndb_update.err

mysql-test/r/openssl_1.err

mysql-test/r/ps_1general.err

mysql-test/r/ps_6bdb.err

mysql-test/r/ps_7ndb.err

mysql-test/r/query_cache.err

mysql-test/r/query_cache_merge.err

mysql-test/r/raid.err

mysql-test/r/repair.err

mysql-test/r/replace.err

mysql-test/r/rpl000001.err

mysql-test/r/rpl000015.err

client/mysqladmin.cc

+17 −8
Original line number Diff line number Diff line
@@ -832,7 +832,8 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      if (argv[1][0])

      {

        char *pw= argv[1];

        bool old= find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD;

        bool old= (find_type(argv[0], &command_typelib, 2) ==

                   ADMIN_OLD_PASSWORD);

#ifdef __WIN__

        uint pw_len= strlen(pw);

        if (pw_len > 1 && pw[0] == '\'' && pw[pw_len-1] == '\'')
@@ -843,21 +844,29 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
           If we don't already know to use an old-style password, see what

           the server is using

        */

        if (!old) {

          if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'")) {

        if (!old)

        {

          if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'"))

          {

            my_printf_error(0, "Could not determine old_passwords setting from server; error: '%s'",

                	    MYF(ME_BELL),mysql_error(mysql));

            return -1;

          } else {

          }

          else

          {

            MYSQL_RES *res= mysql_store_result(mysql);

            if (!res) {

              my_printf_error(0, "Could not get old_passwords setting from server; error: '%s'",

            if (!res)

            {

              my_printf_error(0,

                              "Could not get old_passwords setting from "

                              "server; error: '%s'",

        		      MYF(ME_BELL),mysql_error(mysql));

              return -1;

            }

            if (!mysql_num_rows(res)) {

            if (!mysql_num_rows(res))

              old= 1;

            } else {

            else

            {

              MYSQL_ROW row= mysql_fetch_row(res);

              old= !strncmp(row[1], "ON", 2);

            }

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.9)

AM_INIT_AUTOMAKE(mysql, 4.1.10)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

innobase/os/os0file.c

+15 −9
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ os_io_init_simple(void) 
	}

}



#ifndef UNIV_HOTBACKUP

#if !defined(UNIV_HOTBACKUP) && !defined(__NETWARE__)

/*************************************************************************

Creates a temporary file. This function is defined in ha_innodb.cc. */
@@ -494,7 +494,7 @@ int 
innobase_mysql_tmpfile(void);

/*========================*/

			/* out: temporary file descriptor, or < 0 on error */

#endif /* !UNIV_HOTBACKUP */

#endif /* !UNIV_HOTBACKUP && !__NETWARE__ */



/***************************************************************************

Creates a temporary file. */
@@ -504,6 +504,9 @@ os_file_create_tmpfile(void) 
/*========================*/

			/* out: temporary file handle, or NULL on error */

{

#ifdef __NETWARE__

	FILE*	file	= tmpfile();

#else /* __NETWARE__ */

	FILE*	file	= NULL;

	int	fd	= -1;

# ifdef UNIV_HOTBACKUP
@@ -541,15 +544,18 @@ os_file_create_tmpfile(void) 
	if (fd >= 0) {

		file = fdopen(fd, "w+b");

	}

#endif /* __NETWARE__ */



	if (!file) {

		ut_print_timestamp(stderr);

		fprintf(stderr,

			"  InnoDB: Error: unable to create temporary file;"

			" errno: %d\n", errno);

#ifndef __NETWARE__

		if (fd >= 0) {

			close(fd);

		}

#endif /* !__NETWARE__ */

	}



	return(file);

libmysql/libmysql.def

+1 −0
Original line number Diff line number Diff line
@@ -146,3 +146,4 @@ EXPORTS 
	mysql_rpl_query_type

	mysql_slave_query

	mysql_embedded

	get_defaults_files