Cleanups (d80ebc17) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+3 −1

Original line number	Diff line number	Diff line
		@@ -32537,7 +32537,7 @@ mysql> select MD5("testing");
		This is an "RSA Data Security, Inc. MD5 Message-Digest Algorithm".

		@findex DES_ENCRYPT()
		@item DES_ENCRYPT(string_to_encrypt, flag, [, (key_number \| key_string) ] )
		@item DES_ENCRYPT(string_to_encrypt [, (key_number \| key_string) ] )

		Encrypts the string with the given key using the DES algorithm, which
		provides strong encryption.
		@@ -48931,6 +48931,8 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.

		@itemize @bullet
		@item
		Don't give an error for @code{CREATE TABLE ...(... VARCHAR(0))}.
		@item
		Fixed @code{SIGINT} and @code{SIGQUIT} problems in @file{mysql.cc} on Linux
		with some @code{glibc} versions.
		@item

+2 −2

Original line number	Diff line number	Diff line
		@@ -703,14 +703,14 @@ AC_DEFUN(MYSQL_CHECK_VIO, [
		AC_DEFUN(MYSQL_FIND_OPENSSL, [
		for d in /usr/ssl/include /usr/local/ssl/include /usr/include/openssl \
		/usr/include/ssl /opt/ssl/include /opt/openssl/include \
		/usr/local/ssl/include/openssl ; do
		/usr/local/ssl/include/openssl /usr/local/include/openssl ; do
		if test -f $d/ssl.h ; then
		OPENSSL_INCLUDE=$d
		fi
		done

		for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \
		/usr/lib /opt/ssl/lib /opt/openssl/lib ; do
		/usr/lib /opt/ssl/lib /opt/openssl/lib /usr/local/lib/ ; do
		if test -f $d/libssl.a ; then
		OPENSSL_LIB=$d
		fi

+11 −8

Original line number	Diff line number	Diff line
		@@ -2340,7 +2340,7 @@ static int
		com_status(String *buffer __attribute__((unused)),
		char *line __attribute__((unused)))
		{
		char *status;
		const char *status;
		tee_puts("--------------", stdout);
		usage(1); /* Print version */
		if (connected)
		@@ -2635,18 +2635,21 @@ static const char* construct_prompt() {
		processed_prompt.append(current_db ? current_db : "(none)");
		break;
		case 'h':
		if (strstr(mysql_get_host_info(&mysql),"Localhost")) {
		{
		const char *prompt=mysql_get_host_info(&mysql);
		if (strstr(prompt, "Localhost"))
		processed_prompt.append("localhost");
		}
		else {
		processed_prompt.append(strtok(mysql_get_host_info(&mysql)," "));
		else
		{
		const char *end=strcend(prompt,' ');
		processed_prompt.append(prompt, (uint) (end-prompt));
		}
		break;
		}
		case 'p':
		if (strstr(mysql_get_host_info(&mysql),"TCP/IP")
		\|\| ! mysql.unix_socket) {
		if (strstr(mysql_get_host_info(&mysql),"TCP/IP") \|\|
		! mysql.unix_socket)
		add_int_to_prompt(mysql.port);
		}
		else
		processed_prompt.append(strrchr(mysql.unix_socket,'/')+1);
		break;

+1 −1

Original line number	Diff line number	Diff line
		@@ -400,7 +400,7 @@ static my_bool sql_connect(MYSQL mysql,const char host, const char *user,

		static int execute_commands(MYSQL mysql,int argc, char *argv)
		{
		char *status;
		const char *status;

		for (; argc > 0 ; argv++,argc--)
		{

+4 −3

Original line number	Diff line number	Diff line
		@@ -268,7 +268,7 @@ struct st_replace;
		struct st_replace init_replace(my_string from, my_string *to, uint count,
		my_string word_end_chars);
		uint replace_strings(struct st_replace rep, my_string start,
		uint *max_length, my_string from);
		uint max_length, const char from);
		void free_replace();
		static int insert_pointer_name(reg1 POINTER_ARRAY *pa,my_string name);
		void free_pointer_array(POINTER_ARRAY *pa);
		@@ -2041,7 +2041,8 @@ void reject_dump(const char* record_file, char* buf, int size)

		/* Append the string to ds, with optional replace */

		static void replace_dynstr_append_mem(DYNAMIC_STRING ds, char val, int len)
		static void replace_dynstr_append_mem(DYNAMIC_STRING ds, const char val,
		int len)
		{
		if (glob_replace)
		{
		@@ -3236,7 +3237,7 @@ static uint replace_len(my_string str)
		/* Replace strings; Return length of result string */

		uint replace_strings(REPLACE rep, my_string start,uint *max_length,
		my_string from)
		const char *from)
		{
		reg1 REPLACE *rep_pos;
		reg2 REPLACE_STRING *rep_str;