Commit bd49a2df authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M50/push-5.0 

into  trift2.:/MySQL/M51/push-5.1


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
parents 4cac6d4c 717850d3

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;

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -2544,7 +2544,8 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl 
 sql/sql_builtin.cc sql-common/Makefile dnl

 dbug/Makefile scripts/Makefile include/Makefile dnl

 tests/Makefile Docs/Makefile support-files/Makefile dnl

 support-files/MacOSX/Makefile mysql-test/Makefile dnl

 support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile dnl

 mysql-test/Makefile dnl

 mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile dnl

 include/mysql_version.h plugin/Makefile win/Makefile)

support-files/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ EXTRA_DIST = mysql.spec.sh \ 
			MySQL-shared-compat.spec.sh \

			ndb-config-2-node.ini.sh



SUBDIRS = MacOSX

SUBDIRS =		MacOSX RHEL4-SElinux



pkgdata_DATA =		my-small.cnf \

			my-medium.cnf \