Commit 799765f0 authored by unknown's avatar unknown
Browse files

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

into  fedora.(none):/home/reggie/bk/mysql-5.1-new2


sql/handler.cc:
  Auto merged
parents 3846dff8 d2d09d60

BUILD/compile-amd64-debug-max-no-ndb

0 → 100755
+9 −0
Original line number Diff line number Diff line 
#! /bin/sh

path=`dirname $0`

. "$path/SETUP.sh"

extra_flags="$amd64_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$amd64_configs $debug_configs $max_no_ndb_configs"



. "$path/FINISH.sh"

client/client_priv.h

+2 −3
Original line number Diff line number Diff line
@@ -53,9 +53,8 @@ enum options_client 
  OPT_MYSQL_ONLY_PRINT,

  OPT_MYSQL_LOCK_DIRECTORY,

  OPT_MYSQL_SLAP_SLAVE,

  OPT_MYSQL_NUMBER_OF_QUERY, OPT_MYSQL_NUMBER_OF_ROWS,

  OPT_MYSQL_REPEAT_DATA, OPT_MYSQL_REPEAT_QUERY,

  OPT_MYSQL_PRESERVE_SCHEMA_ENTER, OPT_MYSQL_PRESERVE_SCHEMA_EXIT,

  OPT_MYSQL_NUMBER_OF_QUERY,

  OPT_MYSQL_PRESERVE_SCHEMA,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID

client/mysqlslap.c

+325 −445

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+4 −3
Original line number Diff line number Diff line
@@ -2439,8 +2439,10 @@ MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,storage/bdb,,,[ 
MYSQL_STORAGE_ENGINE(example,,,,,no,storage/example,,,[

  AC_CONFIG_FILES(storage/example/Makefile)

])

MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive)

dnl MYSQL_STORAGE_ENGINE(csv,,,,,tina_hton,,ha_tina.o)

MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,,

 \$(top_builddir)/storage/archive/libarchive.a, [

  AC_CONFIG_FILES(storage/archive/Makefile)

])

MYSQL_STORAGE_ENGINE(csv,,,,,no,storage/csv,,,[

  AC_CONFIG_FILES(storage/csv/Makefile)

])
@@ -2565,7 +2567,6 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) 
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl

 strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl

 storage/myisam/Makefile storage/myisammrg/Makefile dnl

 storage/archive/Makefile dnl

 os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl

 man/Makefile BUILD/Makefile vio/Makefile dnl

 libmysql/Makefile client/Makefile dnl

include/m_ctype.h

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ extern CHARSET_INFO my_charset_ujis_bin; 
extern CHARSET_INFO my_charset_utf8_general_ci;

extern CHARSET_INFO my_charset_utf8_bin;

extern CHARSET_INFO my_charset_cp1250_czech_ci;

extern CHARSET_INFO my_charset_filename;



/* declarations for simple charsets */

extern int  my_strnxfrm_simple(CHARSET_INFO *, uchar *, uint, const uchar *,