Commit 0957814d authored by unknown's avatar unknown
Browse files

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  rurik.mysql.com:/home/igor/mysql-5.1
parents b9dfe986 aacf8e3a

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ 
                        strings mysys dbug extra regex storage \

                        vio sql libmysql_r libmysql client scripts \

			@man_dirs@ tests SSL\

			BUILD netware os2 @libmysqld_dirs@\

			BUILD netware @libmysqld_dirs@\

			@bench_dirs@ support-files server-tools tools \

			plugin win

client/mysql_upgrade.c

+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int create_check_file(const char *path) 
static int create_defaults_file(const char *path, const char *our_defaults_path)

{

  uint b_read;

  File our_defaults_file;

  File our_defaults_file, defaults_file;

  char buffer[512];

  char *buffer_end;

  int error;
@@ -153,7 +153,7 @@ static int create_defaults_file(const char *path, const char *our_defaults_path) 
  if (!opt_password)

    return 0;



  File defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY,

  defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY,

                         MYF(MY_FAE | MY_WME));



  if (defaults_file < 0)

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -2604,7 +2604,6 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) 
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl

 strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl

 storage/myisam/Makefile storage/myisammrg/Makefile dnl

 os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl

 man/Makefile BUILD/Makefile vio/Makefile dnl

 libmysql/Makefile client/Makefile dnl

 pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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 \

			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

			mysql_time.h mysql/plugin.h $(BUILT_SOURCES)

noinst_HEADERS =	config-win.h config-os2.h config-netware.h \

noinst_HEADERS =	config-win.h config-netware.h \

			heap.h my_bitmap.h my_uctype.h \

			myisam.h myisampack.h myisammrg.h ft_global.h\

			mysys_err.h my_base.h help_start.h help_end.h \

include/config-os2.h

deleted100644 → 0
+0 −835

File deleted.

Preview size limit exceeded, changes collapsed.