Commit af7051c9 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-new 

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
parents 4eede6f0 4234038b

client/mysqlslap.c

+2 −1
Original line number Diff line number Diff line
@@ -377,7 +377,8 @@ static struct my_option my_long_options[] = 
  {"create-schema", OPT_CREATE_SLAP_SCHEMA, "Schema to run tests in.",

    (gptr*) &create_schema_string, (gptr*) &create_schema_string, 0, GET_STR, 

    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"csv", OPT_CREATE_SLAP_SCHEMA, "Schema to run tests in.",

  {"csv", OPT_CREATE_SLAP_SCHEMA,

	"Generate CSV output to named file or to stdout if no file is named.",

    (gptr*) &opt_csv_str, (gptr*) &opt_csv_str, 0, GET_STR, 

    OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",

config/ac-macros/storage.m4

+4 −1
Original line number Diff line number Diff line
@@ -39,7 +39,10 @@ then 
  AC_DEFINE([$5])

  mysql_se_decls="${mysql_se_decls},$6"

  mysql_se_htons="${mysql_se_htons},&$6"

  if test "$8" != "no"

  then

    mysql_se_objs="$mysql_se_objs $8"

  fi

  mysql_se_dirs="$mysql_se_dirs $7"

  mysql_se_libs="$mysql_se_libs $9"

else

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -2437,8 +2437,8 @@ MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,, 
 \$(top_builddir)/storage/archive/libarchive.a, [

  AC_CONFIG_FILES(storage/archive/Makefile)

])

MYSQL_STORAGE_ENGINE(csv,,,"yes",,tina_hton,storage/csv,

  ../storage/csv/ha_tina.o,,[

MYSQL_STORAGE_ENGINE(csv,,,"yes",,tina_hton,storage/csv,no,

  \$(top_builddir)/storage/csv/libcsv.a,[

  AC_CONFIG_FILES(storage/csv/Makefile)

])

MYSQL_STORAGE_ENGINE(blackhole)

mysql-test/ndb/ndbcluster.sh

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ while test $# -gt 0; do 
    --small)

     ndb_no_ord=32

     ndb_con_op=5000

     ndb_dmem=10M

     ndb_dmem=20M

     ndb_imem=1M

     ndb_pbmem=4M

     ;;

mysql-test/r/loaddata.result

+27 −0
Original line number Diff line number Diff line
@@ -139,3 +139,30 @@ a b c 
10	NULL	Ten

15	NULL	Fifteen

drop table t1, t2;

CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (1);

SET NAMES latin1;

SET character_set_filesystem=filename;

select @@character_set_filesystem;

@@character_set_filesystem

filename

SELECT * INTO OUTFILE 't-1' FROM t1;

DELETE FROM t1;

LOAD DATA INFILE 't-1' INTO TABLE t1;

SELECT * FROM t1;

a

1

DELETE FROM t1;

SET character_set_filesystem=latin1;

select @@character_set_filesystem;

@@character_set_filesystem

latin1

LOAD DATA INFILE 't@002d1' INTO TABLE t1;

SELECT * FROM t1;

a

1

DROP TABLE t1;

SET character_set_filesystem=default;

select @@character_set_filesystem;

@@character_set_filesystem

binary