Commit 4c5686a9 authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into debian.(none):/M51/mysql-5.1
parents 56d0e302 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)

sql/ha_myisam.cc

+4 −1
Original line number Diff line number Diff line
@@ -296,7 +296,10 @@ int ha_myisam::dump(THD* thd, int fd) 
#endif /* HAVE_REPLICATION */





bool ha_myisam::check_if_locking_is_allowed(THD *thd, TABLE *table, uint count)

bool ha_myisam::check_if_locking_is_allowed(uint sql_command,

                                            ulong type, TABLE *table,

                                            uint count,

                                            bool called_by_logger_thread)

{

  /*

    To be able to open and lock for reading system tables like 'mysql.proc',

sql/ha_myisam.h

+4 −1
Original line number Diff line number Diff line
@@ -60,7 +60,10 @@ class ha_myisam: public handler 
  uint max_supported_key_part_length() const { return MI_MAX_KEY_LENGTH; }

  uint checksum() const;



  virtual bool check_if_locking_is_allowed(THD *thd, TABLE *table, uint count);

  virtual bool check_if_locking_is_allowed(uint sql_command,

                                           ulong type, TABLE *table,

                                           uint count,

                                           bool called_by_logger_thread);

  int open(const char *name, int mode, uint test_if_locked);

  int close(void);

  int write_row(byte * buf);