Commit 85b93971 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
parents 34db50d9 02ac7bef

NEW-RPMS/.cvsignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
MySQL-*.rpm

client/mysql.cc

+5 −4
Original line number Diff line number Diff line
@@ -1133,10 +1133,11 @@ static COMMANDS *find_command(char *name,char cmd_char) 
      parsing the row and calling find_command()

    */

    if (strstr(name, "\\g") || (strstr(name, delimiter) &&

                                strlen(name) >= 9 &&

                                my_strnncoll(charset_info,(uchar*) name,

                                             9,

                                             (const uchar*) "delimiter", 9)))

                                !(strlen(name) >= 9 &&

                                  !my_strnncoll(charset_info,

                                                (uchar*) name, 9,

                                                (const uchar*) "delimiter",

                                                9))))

      DBUG_RETURN((COMMANDS *) 0);

    if ((end=strcont(name," \t")))

    {

client/mysqltest.c

+9 −4
Original line number Diff line number Diff line
@@ -3616,19 +3616,24 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) 
        /* Read result from each column */

        for (col_idx= 0; col_idx < num_fields; col_idx++)

        {

          /* FIXME is string terminated? */

          const char *val= (const char *)bind[col_idx].buffer;

          ulonglong len= *bind[col_idx].length;

          const char *val;

          ulonglong len;

          if (col_idx < max_replace_column && replace_column[col_idx])

          {

            val= replace_column[col_idx];

            len= strlen(val);

          }

          if (*bind[col_idx].is_null)

          else if (*bind[col_idx].is_null)

          {

            val= "NULL";

            len= 4;

          }

          else

          {

            /* FIXME is string terminated? */

            val= (const char *) bind[col_idx].buffer;

            len= *bind[col_idx].length;

          }

          if (!display_result_vertically)

          {

            if (col_idx)                      /* No tab before first col */

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -2272,10 +2272,14 @@ AC_ARG_WITH(man, 
if test "$with_man" = "yes"

then

  man_dirs="man"

  man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`

  man1_files=`echo $man1_files`

else

  man_dirs=""

  man1_files=""

fi

AC_SUBST(man_dirs)

AC_SUBST(man1_files)



# Shall we build the bench code?

AC_ARG_WITH(bench,

man/Makefile.am

+2 −24
Original line number Diff line number Diff line
@@ -17,30 +17,8 @@ 


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



man_MANS =	mysql.1 mysql_zap.1 mysqlaccess.1 \

		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \

		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1



EXTRA_DIST =	mysql.1.in mysql_zap.1.in \

		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \

		mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \

		mysqld_safe.1.in mysql_fix_privilege_tables.1.in



CLEANFILES = $(man_MANS)



SUFFIXES = .in



.in:

	@RM@ -f $@ $@-t

	@SED@ \

	  -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \

	  -e 's!@''sysconfdir''@!@sysconfdir@!' \

	  -e 's!@''bindir''@!$(bindir)!g' \

	  -e 's!@''libexecdir''@!$(libexecdir)!g' \

	  -e 's!@''localstatedir''@!$(localstatedir)!g' \

	  -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \

	$< > $@-t

	@MV@ $@-t $@

man1_MANS =   @man1_files@

EXTRA_DIST =  $(man1_MANS)



# Don't update the files from bitkeeper

%::SCCS/s.%