Commit 66583db0 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
sql/log.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
parents 01e0b848 7d01da59

client/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ LDADD= @CLIENT_EXTRA_LDFLAGS@ \ 
                                $(top_builddir)/libmysql/libmysqlclient.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

				mysqldump mysqlimport mysqltest mysqlbinlog \

				mysqltestmanagerc mysqltestmanager-pwgen

				mysqltestmanagerc mysqltestmanager-pwgen \

				mysqlslap

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h

mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc
@@ -46,6 +47,7 @@ mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c 
mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)

mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)

mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)

mysqlslap_SOURCES=              mysqlslap.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c $(yassl_dummy_link_fix)

mysqlimport_SOURCES=            mysqlimport.c $(yassl_dummy_link_fix)

sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -51,6 +51,6 @@ enum options_client 
#endif

  OPT_TRIGGERS,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_MYSQL_REPLACE_INTO

};

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static void usage(int version) 
	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,

         readline, rl_library_version);

#else

  printf("%s  Ver %s Distrib %s, for %s (%s)", my_progname, VER,

  printf("%s  Ver %s Distrib %s, for %s (%s)\n", my_progname, VER,

	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);

#endif

client/mysqlslap.c

0 → 100644
+1072 −0

File added.

Preview size limit exceeded, changes collapsed.

config/ac-macros/misc.m4

+21 −0
Original line number Diff line number Diff line
@@ -693,6 +693,27 @@ dnl --------------------------------------------------------------------------- 
dnl END OF MYSQL_CHECK_BIG_TABLES SECTION

dnl ---------------------------------------------------------------------------





dnl ---------------------------------------------------------------------------

dnl Macro: MYSQL_CHECK_MAX_INDEXES

dnl Sets MAX_INDEXES

dnl ---------------------------------------------------------------------------

AC_DEFUN([MYSQL_CHECK_MAX_INDEXES], [

  AC_ARG_WITH([max-indexes],

              [

  --with-max-indexes=\#      Sets the maximum number of indexes per table, default 64],

              [max_indexes="$withval"],

              [max_indexes=64])

  AC_MSG_CHECKING([max indexes per table])

  AC_DEFINE_UNQUOTED([MAX_INDEXES], [$max_indexes],

                     [Maximum number of indexes per table])

  AC_MSG_RESULT([$max_indexes])

])

dnl ---------------------------------------------------------------------------

dnl END OF MYSQL_CHECK_MAX_INDEXES SECTION

dnl ---------------------------------------------------------------------------





dnl MYSQL_NEEDS_MYSYS_NEW

AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],

[AC_CACHE_CHECK([needs mysys_new helpers], mysql_use_mysys_new,