Merged from mysql-4.1 to mysql-5.0 (4db138f9) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysqldump.c

+95 −59

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@
		#define EX_CONSCHECK 3
		#define EX_EOM 4
		#define EX_EOF 5 /* ferror for output file was got */
		#define EX_ILLEGAL_TABLE 6

		/* index into 'show fields from table' */

		@@ -142,14 +143,6 @@ const char *compatible_mode_names[]=
		TYPELIB compatible_mode_typelib= {array_elements(compatible_mode_names) - 1,
		"", compatible_mode_names, NULL};

		#define TABLE_RULE_HASH_SIZE 16

		typedef struct st_table_rule_ent
		{
		char* key; /* dbname.tablename */
		uint key_len;
		} TABLE_RULE_ENT;

		HASH ignore_table;

		static struct my_option my_long_options[] =
		@@ -544,29 +537,21 @@ static void write_footer(FILE *sql_file)
		} /* write_footer */


		static void free_table_ent(TABLE_RULE_ENT* e)
		{
		my_free((gptr) e, MYF(0));
		}


		static byte* get_table_key(TABLE_RULE_ENT* e, uint* len,
		byte* get_table_key(const char entry, uint length,
		my_bool not_used __attribute__((unused)))
		{
		*len= e->key_len;
		return (byte*)e->key;
		*length= strlen(entry);
		return (byte*) entry;
		}


		void init_table_rule_hash(HASH* h)
		{
		if(hash_init(h, charset_info, TABLE_RULE_HASH_SIZE, 0, 0,
		(hash_get_key) get_table_key,
		(hash_free_key) free_table_ent, 0))
		if(hash_init(h, charset_info, 16, 0, 0,
		(hash_get_key) get_table_key, 0, 0))
		exit(EX_EOM);
		}


		static my_bool
		get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		char *argument)
		@@ -639,25 +624,15 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		break;
		case (int) OPT_IGNORE_TABLE:
		{
		uint len= (uint)strlen(argument);
		TABLE_RULE_ENT* e;
		if (!strchr(argument, '.'))
		{
		fprintf(stderr, "Illegal use of option --ignore-table=<database>.<table>\n");
		exit(1);
		}
		/* len is always > 0 because we know the there exists a '.' */
		e= (TABLE_RULE_ENT*)my_malloc(sizeof(TABLE_RULE_ENT) + len, MYF(MY_WME));
		if (!e)
		exit(EX_EOM);
		e->key= (char*)e + sizeof(TABLE_RULE_ENT);
		e->key_len= len;
		memcpy(e->key, argument, len);

		if (!hash_inited(&ignore_table))
		init_table_rule_hash(&ignore_table);

		if(my_hash_insert(&ignore_table, (byte*)e))
		if (my_hash_insert(&ignore_table, (byte*)my_strdup(argument, MYF(0))))
		exit(EX_EOM);
		break;
		}
		@@ -980,7 +955,28 @@ static char quote_name(const char name, char *buff, my_bool force)
		return buff;
		} /* quote_name */

		/*
		Quote a table name so it can be used in "SHOW TABLES LIKE <tabname>"

		SYNOPSIS
		quote_for_like
		name - name of the table
		buff - quoted name of the table

		DESCRIPTION
		Quote \, _, ' and % characters

		Note: Because MySQL uses the C escape syntax in strings
		(for example, '\n' to represent newline), you must double
		any '\' that you use in your LIKE strings. For example, to
		search for '\n', specify it as '\\n'. To search for '\', specify
		it as '\\\\' (the backslashes are stripped once by the parser
		and another time when the pattern match is done, leaving a
		single backslash to be matched).

		Example: "t\1" => "t\\\\1"

		*/

		static char quote_for_like(const char name, char *buff)
		{
		@@ -988,7 +984,13 @@ static char quote_for_like(const char name, char *buff)
		*to++= '\'';
		while (*name)
		{
		if (name == '\'' \|\| name == '_' \|\| name == '\\' \|\| name == '%')
		if (*name == '\\')
		{
		*to++='\\';
		*to++='\\';
		*to++='\\';
		}
		else if (name == '\'' \|\| name == '_' \|\| *name == '%')
		*to++= '\\';
		to++= name++;
		}
		@@ -1139,6 +1141,7 @@ static uint get_table_structure(char table, char db)
		FILE *sql_file = md_result_file;
		int len;
		DBUG_ENTER("get_table_structure");
		DBUG_PRINT("enter", ("db: %s, table: %s", db, table));

		if (!insert_pat_inited)
		{
		@@ -2327,27 +2330,60 @@ static int get_actual_table_name(const char *old_table_name,

		static int dump_selected_tables(char db, char *table_names, int tables)
		{
		uint numrows;
		int i;
		uint numrows, i;
		char table_buff[NAME_LEN*+3];
		char new_table_name[NAME_LEN];
		DYNAMIC_STRING lock_tables_query;
		HASH dump_tables;

		DBUG_ENTER("dump_selected_tables");

		if (init_dumping(db))
		return 1;

		/* Init hash table for storing the actual name of tables to dump */
		if (hash_init(&dump_tables, charset_info, 16, 0, 0,
		(hash_get_key) get_table_key, 0, 0))
		exit(EX_EOM);

		init_dynamic_string(&lock_tables_query, "LOCK TABLES ", 256, 1024);
		for (; tables > 0 ; tables-- , table_names++)
		{
		/* the table name passed on commandline may be wrong case */
		if (!get_actual_table_name( *table_names,
		new_table_name, sizeof(new_table_name) ))
		{
		/* Add found table name to lock_tables_query */
		if (lock_tables)
		{
		DYNAMIC_STRING query;
		dynstr_append(&lock_tables_query,
		quote_name(new_table_name, table_buff, 1));
		dynstr_append(&lock_tables_query, " READ /!32311 LOCAL /,");
		}

		init_dynamic_string(&query, "LOCK TABLES ", 256, 1024);
		for (i=0 ; i < tables ; i++)
		/* Add found table name to dump_tables list */
		if (my_hash_insert(&dump_tables,
		(byte*)my_strdup(new_table_name, MYF(0))))
		exit(EX_EOM);

		}
		else
		{
		dynstr_append(&query, quote_name(table_names[i], table_buff, 1));
		dynstr_append(&query, " READ /!32311 LOCAL /,");
		my_printf_error(0,"Couldn't find table: \"%s\"\n", MYF(0),
		*table_names);
		safe_exit(EX_ILLEGAL_TABLE);
		/* We shall countinue here, if --force was given */
		}
		if (mysql_real_query(sock, query.str, query.length-1))
		}

		if (lock_tables)
		{
		if (mysql_real_query(sock, lock_tables_query.str,
		lock_tables_query.length-1))
		DB_error(sock, "when doing LOCK TABLES");
		/* We shall countinue here, if --force was given */
		dynstr_free(&query);
		}
		dynstr_free(&lock_tables_query);
		if (flush_logs)
		{
		if (mysql_refresh(sock, REFRESH_LOG))
		@@ -2356,25 +2392,25 @@ static int dump_selected_tables(char db, char *table_names, int tables)
		}
		if (opt_xml)
		print_xml_tag1(md_result_file, "", "database name=", db, "\n");
		for (i=0 ; i < tables ; i++)
		/* Dump each selected table */
		const char *table_name;
		for (i= 0; i < dump_tables.records; i++)
		{
		char new_table_name[NAME_LEN];

		/* the table name passed on commandline may be wrong case */
		if (!get_actual_table_name( table_names[i], new_table_name,
		sizeof(new_table_name)))
		{
		numrows= get_table_structure(new_table_name, db);
		dump_table(numrows, new_table_name);
		}
		my_free(order_by, MYF(MY_ALLOW_ZERO_PTR));
		order_by= 0;
		table_name= hash_element(&dump_tables, i);
		DBUG_PRINT("info",("Dumping table %s", table_name));
		numrows = get_table_structure(table_name, db);
		dump_table(numrows, table_name);
		}
		if (was_views)
		{
		for (i=0 ; i < tables ; i++)
		get_view_structure(table_names[i], db);
		for(i=0; i < dump_tables.records; i++)
		{
		table_name= hash_element(&dump_tables, i);
		get_view_structure(table_name, db);
		}
		hash_free(&dump_tables);
		my_free(order_by, MYF(MY_ALLOW_ZERO_PTR));
		order_by= 0;
		if (opt_xml)
		{
		fputs("</database>\n", md_result_file);
		@@ -2382,7 +2418,7 @@ static int dump_selected_tables(char db, char *table_names, int tables)
		}
		if (lock_tables)
		mysql_query_with_error_report(sock, 0, "UNLOCK TABLES");
		return 0;
		DBUG_RETURN(0);
		} /* dump_selected_tables */

client/mysqltest.c

+31 −2

Original line number	Diff line number	Diff line
		@@ -986,9 +986,38 @@ static void do_exec(struct st_query* q)
		replace_dynstr_append(ds, buf);
		}
		error= pclose(res_file);

		if (error != 0)
		die("command \"%s\" failed", cmd);
		{
		uint status= WEXITSTATUS(error);
		if(q->abort_on_error)
		die("At line %u: command \"%s\" failed", start_lineno, cmd);
		else
		{
		DBUG_PRINT("info",
		("error: %d, status: %d", error, status));
		bool ok= 0;
		uint i;
		for (i=0 ; (uint) i < q->expected_errors ; i++)
		{
		DBUG_PRINT("info", ("expected error: %d", q->expected_errno[i].code.errnum));
		if ((q->expected_errno[i].type == ERR_ERRNO) &&
		(q->expected_errno[i].code.errnum == status))
		ok= 1;
		verbose_msg("At line %u: command \"%s\" failed with expected error: %d",
		start_lineno, cmd, status);
		}
		if (!ok)
		die("At line: %u: command \"%s\" failed with wrong error: %d",
		start_lineno, cmd, status);
		}
		}
		else if (q->expected_errno[0].type == ERR_ERRNO &&
		q->expected_errno[0].code.errnum != 0)
		{
		/* Error code we wanted was != 0, i.e. not an expected success */
		die("At line: %u: command \"%s\" succeeded - should have failed with errno %d...",
		start_lineno, cmd, q->expected_errno[0].code.errnum);
		}

		if (!disable_result_log)
		{

mysql-test/include/not_openssl.inc

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		-- require r/not_openssl.require
		disable_query_log;
		show variables like "have_openssl";
		enable_query_log;

mysql-test/mysql-test-run.sh

+3 −0

Original line number	Diff line number	Diff line
		@@ -707,6 +707,9 @@ MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST --no-defaults --testcase --user=root --soc
		if [ "x$USE_EMBEDDED_SERVER" = "x1" ]; then
		MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST -A --language=$LANGUAGE -A --datadir=$SLAVE_MYDDIR -A --character-sets-dir=$CHARSETSDIR"
		fi
		# Save path and name of mysqldump
		MYSQL_DUMP_DIR="$MYSQL_DUMP"
		export MYSQL_DUMP_DIR
		MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
		MYSQL_SHOW="$MYSQL_SHOW -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSHOW_OPT"
		MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR --character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT"

mysql-test/r/func_encrypt.result

+56 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,60 @@ hello
		select des_decrypt(des_encrypt("hello",4),'password4');
		des_decrypt(des_encrypt("hello",4),'password4')
		hello
		select des_encrypt("hello",10);
		des_encrypt("hello",10)
		NULL
		Warnings:
		Error 1108 Incorrect parameters to procedure 'des_encrypt'
		select des_encrypt(NULL);
		des_encrypt(NULL)
		NULL
		Warnings:
		Error 1108 Incorrect parameters to procedure 'des_encrypt'
		select des_encrypt(NULL, 10);
		des_encrypt(NULL, 10)
		NULL
		Warnings:
		Error 1108 Incorrect parameters to procedure 'des_encrypt'
		select des_encrypt(NULL, NULL);
		des_encrypt(NULL, NULL)
		NULL
		Warnings:
		Error 1108 Incorrect parameters to procedure 'des_encrypt'
		select des_encrypt(10, NULL);
		des_encrypt(10, NULL)
		NULL
		Warnings:
		Error 1108 Incorrect parameters to procedure 'des_encrypt'
		select des_encrypt("hello", NULL);
		des_encrypt("hello", NULL)
		NULL
		Warnings:
		Error 1108 Incorrect parameters to procedure 'des_encrypt'
		select des_decrypt("hello",10);
		des_decrypt("hello",10)
		hello
		select des_decrypt(NULL);
		des_decrypt(NULL)
		NULL
		Warnings:
		Error 1108 Incorrect parameters to procedure 'des_decrypt'
		select des_decrypt(NULL, 10);
		des_decrypt(NULL, 10)
		NULL
		Warnings:
		Error 1108 Incorrect parameters to procedure 'des_decrypt'
		select des_decrypt(NULL, NULL);
		des_decrypt(NULL, NULL)
		NULL
		Warnings:
		Error 1108 Incorrect parameters to procedure 'des_decrypt'
		select des_decrypt(10, NULL);
		des_decrypt(10, NULL)
		10
		select des_decrypt("hello", NULL);
		des_decrypt("hello", NULL)
		hello
		SET @a=des_decrypt(des_encrypt("hello"));
		flush des_key_file;
		select @a = des_decrypt(des_encrypt("hello"));
		@@ -134,6 +188,8 @@ NULL
		select hex(des_decrypt(des_encrypt("hello","hidden")));
		hex(des_decrypt(des_encrypt("hello","hidden")))
		NULL
		Warnings:
		Error 1108 Incorrect parameters to procedure 'des_decrypt'
		explain extended select des_decrypt(des_encrypt("hello",4),'password2'), des_decrypt(des_encrypt("hello","hidden"));
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used