Commit 0ccda052 authored by unknown's avatar unknown
Browse files

Merge 


config/ac-macros/ha_ndbcluster.m4:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/log.cc:
  SCCS merged
sql/sql_base.cc:
  SCCS merged
parents 7fb64e0f 564a94da

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ cmd-line-utils/libedit/makelist 
comon.h

comp_err/*.ds?

comp_err/*.vcproj

compile

config.cache

config.guess

config.h
@@ -553,6 +554,7 @@ libmysqld/spatial.cc 
libmysqld/sql_acl.cc

libmysqld/sql_analyse.cc

libmysqld/sql_base.cc

libmysqld/sql_builtin.cc

libmysqld/sql_cache.cc

libmysqld/sql_class.cc

libmysqld/sql_command
@@ -1179,6 +1181,7 @@ sql/share/gmon.out 
sql/share/mysql

sql/share/norwegian-ny/errmsg.sys

sql/share/norwegian/errmsg.sys

sql/sql_builtin.cc

sql/sql_select.cc.orig

sql/sql_yacc.cc

sql/sql_yacc.h

BUILD/SETUP.sh

+3 −12
Original line number Diff line number Diff line
@@ -147,18 +147,9 @@ static_link="$static_link --with-client-ldflags=-all-static" 
local_infile_configs="--enable-local-infile"





max_configs="--with-innodb --with-berkeley-db"

max_configs="$max_configs --with-archive-storage-engine"

max_configs="$max_configs --with-big-tables"

max_configs="$max_configs --with-blackhole-storage-engine"

max_configs="$max_configs --with-federated-storage-engine"

max_configs="$max_configs --with-csv-storage-engine"

max_configs="$max_configs --with-example-storage-engine"

max_configs="$max_configs --with-partition $SSL_LIBRARY"



max_no_embedded_configs="$max_configs --with-ndbcluster"

max_no_ndb_configs="$max_configs --without-ndbcluster --with-embedded-server"

max_configs="$max_configs --with-ndbcluster --with-embedded-server"

max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max"

max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server"

max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server"



#

# CPU and platform specific compilation flags.

Makefile.am

+2 −3
Original line number Diff line number Diff line
@@ -24,12 +24,11 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ 
SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \

			@sql_union_dirs@ storage \

			@sql_union_dirs@ storage plugin \

			@sql_server@ scripts @man_dirs@ tests \

			@mysql_se_plugins@ \

			netware @libmysqld_dirs@ \

			mysql-test support-files @tools_dirs@ \

			plugin unittest win

			unittest win



DIST_SUBDIRS =		$(SUBDIRS) BUILD

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -364,6 +364,10 @@ SOURCE=..\sql-common\my_time.c 
# End Source File

# Begin Source File

 

SOURCE=..\sql-common\my_user.c

# End Source File

# Begin Source File



SOURCE=..\sql\net_serv.cpp

# End Source File

# Begin Source File

VC++Files/libmysqld/libmysqld_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -338,6 +338,10 @@ SOURCE="..\sql-common\my_time.c" 
# End Source File

# Begin Source File



SOURCE="..\sql-common\my_user.c"

# End Source File

# Begin Source File



SOURCE=..\sql\net_serv.cpp

# End Source File

# Begin Source File