Commit baddc8bd authored by unknown's avatar unknown
Browse files

Merge chilla.local:/home/mydev/mysql-5.0-axmrg 

into  chilla.local:/home/mydev/mysql-5.1-axmrg


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
BitKeeper/deleted/.del-mysqld.cc.rej:
  Delete: sql/mysqld.cc.rej
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
  Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Null merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Null merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
  Auto merged
BUILD/SETUP.sh:
  Manual merged
Makefile.am:
  Manual merged
configure.in:
  Manual merged
include/my_pthread.h:
  Manual merged
mysql-test/Makefile.am:
  Manual merged
sql/mysqld.cc:
  Manual merged
support-files/mysql.spec.sh:
  Manual merged
parents 42236fd9 cd4670a7

BUILD/SETUP.sh

+9 −1
Original line number Diff line number Diff line
@@ -139,9 +139,17 @@ fi 
#

base_configs="--prefix=$prefix --enable-assembler "

base_configs="$base_configs --with-extra-charsets=complex "

base_configs="$base_configs --enable-thread-safe-client --with-readline "

base_configs="$base_configs --enable-thread-safe-client "

base_configs="$base_configs --with-big-tables"



if test -d "$path/../cmd-line-utils/readline"

then

    base_configs="$base_configs --with-readline"

elif test -d "$path/../cmd-line-utils/libedit"

then

    base_configs="$base_configs --with-libedit"

fi



static_link="--with-mysqld-ldflags=-all-static "

static_link="$static_link --with-client-ldflags=-all-static"

# we need local-infile in all binaries for rpl000001

BUILD/SETUP.sh.rej

0 → 100644
+19 −0
Original line number Diff line number Diff line 
***************

*** 39,46 ****

  c_warnings="$global_warnings -Wunused"

  cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

  

! alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

! pentium_cflags="-mcpu=pentiumpro"

  sparc_cflags=""

  

  # be as fast as we can be without losing our ability to backtrace

--- 39,46 ----

  c_warnings="$global_warnings -Wunused"

  cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

  

! #alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

! #pentium_cflags="-mcpu=pentiumpro"

  sparc_cflags=""

  

  # be as fast as we can be without losing our ability to backtrace

client/mysql.cc

+3 −3
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ static char **new_mysql_completion (const char *text, int start, int end); 
#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)

char *no_completion(const char*,int)

#else

int no_completion()

char *no_completion()

#endif

{

  return 0;					/* No filename completion */
@@ -1496,10 +1496,10 @@ static void initialize_readline (char *name) 
  setlocale(LC_ALL,""); /* so as libedit use isprint */

#endif

  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;

  rl_completion_entry_function= (Function*)&no_completion;

  rl_completion_entry_function= &no_completion;

#else

  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;

  rl_completion_entry_function= (Function*)&no_completion;

  rl_completion_entry_function= &no_completion;

#endif

}

cmd-line-utils/libedit/readline.c

+5 −6
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ int rl_attempted_completion_over = 0; 
char *rl_basic_word_break_characters = break_chars;

char *rl_completer_word_break_characters = NULL;

char *rl_completer_quote_characters = NULL;

Function *rl_completion_entry_function = NULL;

CPFunction *rl_completion_entry_function = NULL;

CPPFunction *rl_attempted_completion_function = NULL;

Function *rl_pre_input_hook = NULL;

Function *rl_startup1_hook = NULL;
@@ -1724,7 +1724,7 @@ rl_display_match_list (matches, len, max) 
static int

_rl_complete_internal(int what_to_do)

{

	Function *complet_func;

	CPFunction *complet_func;

	const LineInfo *li;

	char *temp, **matches;

	const char *ctemp;
@@ -1737,7 +1737,7 @@ _rl_complete_internal(int what_to_do) 


	complet_func = rl_completion_entry_function;

	if (!complet_func)

		complet_func = (Function *)(void *)filename_completion_function;

		complet_func = filename_completion_function;



	/* We now look backwards for the start of a filename/variable word */

	li = el_line(e);
@@ -1764,7 +1764,7 @@ _rl_complete_internal(int what_to_do) 
	} else

		matches = 0;

	if (!rl_attempted_completion_function || !matches)

		matches = completion_matches(temp, (CPFunction *)complet_func);

		matches = completion_matches(temp, complet_func);



	if (matches) {

		int i, retval = CC_REFRESH;
@@ -1789,8 +1789,7 @@ _rl_complete_internal(int what_to_do) 
			 * object is a directory.

			 */

			size_t alen = strlen(matches[0]);

			if ((complet_func !=

			    (Function *)filename_completion_function

			if ((complet_func != filename_completion_function

			      || (alen > 0 && (matches[0])[alen - 1] != '/'))

			    && rl_completion_append_character) {

				char buf[2];

cmd-line-utils/libedit/readline/readline.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ extern int max_input_history; 
extern char		*rl_basic_word_break_characters;

extern char		*rl_completer_word_break_characters;

extern char		*rl_completer_quote_characters;

extern Function		*rl_completion_entry_function;

extern CPFunction	*rl_completion_entry_function;

extern CPPFunction	*rl_attempted_completion_function;

extern int		rl_completion_type;

extern int		rl_completion_query_items;