Commit 439e4aff 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


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/parser.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/sp_gis.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/parser.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 40762f91 9282ad20

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,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, 5.1.14-beta)

AM_INIT_AUTOMAKE(mysql, 5.1.15-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

mysql-test/mysql-test-run.pl

+3 −0
Original line number Diff line number Diff line
@@ -792,6 +792,9 @@ sub command_line_setup () { 
    {

      # Only platforms that have native symlinks can use the vardir trick

      $opt_mem= $opt_vardir;

      # Delete the default directory in case it exists since we're going to create

      # a new one later anyway, and the mkpath below throws a fatal error otherwise

      eval { rmtree($default_vardir, 1, 1); };

      mtr_report("Using 4.1 vardir trick");

    }

storage/ndb/src/common/util/File.cpp

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ File_class::size(FILE* f) 
  MY_STAT s;



  // Note that my_fstat behaves *differently* than my_stat. ARGGGHH!

  if(my_fstat(::fileno(f), &s, MYF(0)))

  if (my_fstat(fileno(f), &s, MYF(0)))

    return 0;



  return s.st_size;