Commit dea988a0 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/parser.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/parser.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
mysql-test/r/udf.result:
  Manual merge
mysql-test/t/events_bugs.test:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge
parents 23b2d1d2 a12fff73

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ client/sql_string.cpp 
client/ssl_test

client/thimble

client/thread_test

client/tmp.diff

client_debug/*

client_release/*

client_test
@@ -1330,10 +1331,12 @@ mysql-test/r/slave-running.eval 
mysql-test/r/slave-stopped.eval

mysql-test/r/symlink.log

mysql-test/r/system_mysql_db.log

mysql-test/r/tmp.result

mysql-test/r/udf.log

mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/t/index_merge.load

mysql-test/t/tmp.test

mysql-test/var

mysql-test/var/*

mysql.kdevprj

BitKeeper/etc/collapsed

+10 −0
Original line number Diff line number Diff line
@@ -16,7 +16,17 @@ 
45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454bb488ijVLOUK_GFjcoISE0GxPUA

454bb9a8AwlGRC_wWLS2sNMoRBMRGw

454c946ciQoR4dfTBZ0RTBmGJKp6lw

454f6e7eAnfLD9OCbGr5X9KiKvfKcQ

454f704bJiJy0_Nx2drY9P5kK3uOzg

454f8960jsVT_kMKJtZ9OCgXoba0xQ

454fa71cxshxszXJQYa9jbo0-_hAHw

4550b0ceIcozdgQhWFUTAtWkN196lA

4554a95d7txO1DuO9G3nAizI3SkFAA

4554b3722d71SbPiI2Gx-RhbZjmuIQ

4558b3d73Cxjlb7Wv1oytdSTthxDfw

4561b2ecZbhuAc0TTDdCdultxUYaMw

4561bde4qWhz1I8tkItXKex5uniipA

4562ba016dYH0JzszOqZ8p6psbKfnQ

client/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl taocrypt zlib wsock 
ADD_EXECUTABLE(mysqlimport mysqlimport.c)

TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)

TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient mysys dbug yassl taocrypt zlib wsock32)

ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c ../mysys/my_getpagesize.c)

TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlshow mysqlshow.c)

TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl taocrypt zlib wsock32)

client/Makefile.am

+54 −37
Original line number Diff line number Diff line
@@ -16,69 +16,87 @@ 


# This file is public domain and comes with NO WARRANTY of any kind



if HAVE_YASSL

  yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp

else

  yassl_dummy_link_fix=

endif



if THREAD_SAFE_CLIENT

LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql_r/libmysqlclient_r.la

else

LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql/libmysqlclient.la

endif



#AUTOMAKE_OPTIONS =              nostdinc

INCLUDES =			-I$(top_builddir)/include \

				-I$(top_srcdir)/include \

				-I$(top_srcdir)/regex \

                                $(openssl_includes)



LIBS =				@CLIENT_LIBS@



LDADD=				@CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \

				$(top_builddir)/libmysql/libmysqlclient.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

				mysqldump mysqlimport mysqltest mysqlbinlog \

				mysqlslap mysql_upgrade



noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h

mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc



EXTRA_DIST =			get_password.c CMakeLists.txt



bin_PROGRAMS =			mysql \

				mysqladmin \

				mysqlbinlog \

				mysqlcheck \

				mysqldump \

				mysqlimport \

				mysqlshow \

				mysqlslap \

				mysqltest \

				mysql_upgrade



mysql_SOURCES =			mysql.cc readline.cc sql_string.cc \

				completion_hash.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ \

				$(LDADD) $(CXXLDFLAGS)

mysqladmin_SOURCES =		mysqladmin.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqltest_SOURCES=		mysqltest.c $(top_srcdir)/mysys/my_getsystime.c \

				$(yassl_dummy_link_fix)

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD) \

				$(top_builddir)/mysys/libmysys.a

mysqlbinlog_SOURCES =		mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \



mysqlbinlog_SOURCES =		mysqlbinlog.cc \

				$(top_srcdir)/mysys/mf_tempdir.c \

				$(top_srcdir)/mysys/my_new.cc \

				$(top_srcdir)/mysys/my_bit.c \

				$(top_srcdir)/mysys/my_bitmap.c \

				$(top_srcdir)/mysys/my_vle.c \

				$(top_srcdir)/mysys/base64.c

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \



mysqldump_SOURCES=              mysqldump.c \

				my_user.c \

	                        $(top_srcdir)/mysys/mf_getdate.c



mysqlimport_SOURCES=		mysqlimport.c



mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a

mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \



mysqlshow_SOURCES=		mysqlshow.c



mysqlslap_SOURCES=		mysqlslap.c

mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a

mysqlcheck_SOURCES=		mysqlcheck.c $(yassl_dummy_link_fix)

mysqlshow_SOURCES=		mysqlshow.c $(yassl_dummy_link_fix)

mysqlslap_SOURCES=		mysqlslap.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c my_user.c \

	                        $(top_srcdir)/mysys/mf_getdate.c \

                                $(yassl_dummy_link_fix)

mysqlimport_SOURCES=		mysqlimport.c $(yassl_dummy_link_fix)

mysql_upgrade_SOURCES=          mysql_upgrade.c $(yassl_dummy_link_fix)

sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c



mysqltest_SOURCES=		mysqltest.c \

				$(top_srcdir)/mysys/my_getsystime.c \

				$(top_srcdir)/mysys/my_copy.c

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)



mysql_upgrade_SOURCES=          mysql_upgrade.c \

                                $(top_srcdir)/mysys/my_getpagesize.c



# Fix for mit-threads

DEFS =			-DUNDEF_THREADS_HACK \

			-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \

			-DDATADIR="\"$(localstatedir)\""

EXTRA_DIST =		get_password.c CMakeLists.txt



sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c



link_sources:

	for f in $(sql_src) ; do \
@@ -92,6 +110,5 @@ link_sources: 
         rm -f $(srcdir)/my_user.c; \

         @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;





# Don't update the files from bitkeeper

%::SCCS/s.%

client/mysql.cc

+24 −3
Original line number Diff line number Diff line
@@ -830,9 +830,22 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    break;

  case OPT_DELIMITER:

    if (argument == disabled_my_option) 

    {

      strmov(delimiter, DEFAULT_DELIMITER);

    }

    else 

    {

      /* Check that delimiter does not contain a backslash */

      if (!strstr(argument, "\\")) 

      {

        strmake(delimiter, argument, sizeof(delimiter) - 1);

      }

      else 

      {

        put_info("DELIMITER cannot contain a backslash character", INFO_ERROR);

        return 0;

      } 

    }

    delimiter_length= (uint)strlen(delimiter);

    delimiter_str= delimiter;

    break;
@@ -3032,6 +3045,14 @@ com_delimiter(String *buffer __attribute__((unused)), char *line) 
	     INFO_ERROR);

    return 0;

  }

  else

  {

    if (strstr(tmp, "\\")) 

    {

      put_info("DELIMITER cannot contain a backslash character", INFO_ERROR);

      return 0;

    }

  }

  strmake(delimiter, tmp, sizeof(delimiter) - 1);

  delimiter_length= (int)strlen(delimiter);

  delimiter_str= delimiter;