Merge work.mysql.com:/home/bk/mysql (34c7229a) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+1 −5

Original line number	Diff line number	Diff line
		monty@donna.mysql.com
		mwagner@evoq.home.mwagner.org
		paul@central.snake.net
		sasha@mysql.sashanet.com
		serg@serg.mysql.com
		tim@threads.polyesthetic.msg
		sasha@work.mysql.com

Docs/manual.texi

+39 −0

Original line number	Diff line number	Diff line
		@@ -3879,6 +3879,14 @@ Italy [tzone.it] @
		@c @uref{http://mysql.iol.ie, WWW}
		@c @uref{ftp://ftp.iol.ie/pub/mysql, FTP}

		@item
		@c Added 20001031
		@c EMAIL: dave@esat.net (Dave Rynne)
		@c @image{Flags/ireland}
		Ireland [Esat Net] @
		@uref{http://ftp.esat.net/mirrors/download.sourceforge.net/pub/mirrors/mysql/, WWW}
		@uref{ftp://ftp.esat.net/mirrors/download.sourceforge.net/pub/mirrors/mysql/, FTP}

		@item
		@c EMAIL: W.Sylwestrzak@icm.edu.pl (Wojtek Sylwestrzak)
		@c mirroring nightly at 05:25
		@@ -3900,6 +3908,14 @@ Poland [Sunsite] @
		@c @uref{http://mysql.leirianet.pt, WWW}
		@c @uref{ftp://ftp.leirianet.pt/pub/mysql/,FTP}

		@item
		@c Added 20001031
		@c bofh@netc.pt (Bruno Rodrigues)
		@c @image{Flags/portugal}
		Portugal [Netc] @
		@uref{http://ftp.netc.pt/pub/mysql/, WWW}
		@uref{ftp://ftp.netc.pt/pub/mysql/, FTP}

		@item
		@c EMAIL: kuzmin@dn.ru (Roma Kuzmin)
		@c @image{Flags/russia}
		@@ -4133,11 +4149,26 @@ USA [LinuxWired/Scottsdale, AZ] @
		@uref{http://mysql.linuxwired.net/, WWW}
		@uref{ftp://ftp.linuxwired.net/pub/mirrors/mysql/, FTP}

		@item
		@c EMAIL: dan@surfsouth.com (Dan Muntz)
		@c @image{Flags/usa}
		USA [Venoma.Org/Valdosta, GA] @
		@uref{http://mysql.venoma.org/, WWW}

		@end itemize

		@strong{South America:}

		@itemize @bullet

		@item
		@c Added 20001102
		@c EMAIL: nico@bannerlandia.com (Nicolas Moldavsky)
		@c @image{Flags/argentina}
		Argentina [bannerlandia.com] @
		@uref{http://mysql.bannerlandia.com.ar/, WWW}
		@uref{ftp://mysql.bannerlandia.com.ar/mirrors/mysql/, FTP}

		@c @item
		@c Not ok 20000919; Non-existent (Matt)
		@c EMAIL: gaiser@matrix.com.br (Roberto Gaiser)
		@@ -4273,6 +4304,14 @@ Taiwan [TTN] @
		@c EX: serge@oneway.net
		@c @image{Flags/taiwan} Taiwan [Oneway] @
		@c @uref{ftp://ftp.oneway.com.tw/pub/mysql/, FTP}

		@item
		@c Added 20001031
		@c EMAIL: ijliao@php.nctu.edu.tw (Ying-Chieh Liao)
		@c @image{Flags/taiwan}
		Taiwan [nctu.edu/HsinChu] @
		@uref{http://mysql.nctu.edu.tw/, WWW}

		@end itemize

		@strong{Australia:}

client/mysqldump.c

+213 −131

Original line number	Diff line number	Diff line
		@@ -594,7 +594,88 @@ static uint getTableStructure(char table, char db)
		if (verbose)
		fprintf(stderr, "# Retrieving table structure for table %s...\n", table);

		sprintf(insert_pat,"SET OPTION SQL_QUOTE_SHOW_CREATE=%d", opt_quoted);
		table_name=quote_name(table,table_buff);

		if (mysql_query(sock,insert_pat))
		{
		/* using SHOW CREATE statement */
		if (!tFlag)
		{
		/* Make an sql-file, if path was given iow. option -T was given */
		char buff[20+FN_REFLEN];

		sprintf(buff,"show create table %s",table_name);
		if (mysql_query(sock, buff))
		{
		fprintf(stderr, "%s: Can't get CREATE TABLE for table '%s' (%s)\n",
		my_progname, table, mysql_error(sock));
		safe_exit(EX_MYSQLERR);
		DBUG_RETURN(0);
		}

		if (path)
		{
		char filename[FN_REFLEN], tmp_path[FN_REFLEN];
		strmov(tmp_path,path);
		convert_dirname(tmp_path);
		sql_file= my_fopen(fn_format(filename, table, tmp_path, ".sql", 4),
		O_WRONLY, MYF(MY_WME));
		if (!sql_file) /* If file couldn't be opened */
		{
		safe_exit(EX_MYSQLERR);
		DBUG_RETURN(0);
		}
		write_heder(sql_file, db);
		}
		fprintf(sql_file, "\n#\n# Table structure for table '%s'\n#\n\n", table);
		if (opt_drop)
		fprintf(sql_file, "DROP TABLE IF EXISTS %s;\n",table_name);

		tableRes=mysql_store_result(sock);
		row=mysql_fetch_row(tableRes);
		fprintf(sql_file, "%s;\n", row[1]);
		mysql_free_result(tableRes);
		}
		sprintf(insert_pat,"show fields from %s",table_name);
		if (mysql_query(sock,insert_pat) \|\| !(tableRes=mysql_store_result(sock)))
		{
		fprintf(stderr, "%s: Can't get info about table: '%s'\nerror: %s\n",
		my_progname, table, mysql_error(sock));
		safe_exit(EX_MYSQLERR);
		DBUG_RETURN(0);
		}

		if (cFlag)
		sprintf(insert_pat, "INSERT %sINTO %s (", delayed, table_name);
		else
		{
		sprintf(insert_pat, "INSERT %sINTO %s VALUES ", delayed, table_name);
		if (!extended_insert)
		strcat(insert_pat,"(");
		}

		strpos=strend(insert_pat);
		while ((row=mysql_fetch_row(tableRes)))
		{
		ulong *lengths=mysql_fetch_lengths(tableRes);
		if (init)
		{
		if (cFlag)
		strpos=strmov(strpos,", ");
		}
		init=1;
		if (cFlag)
		strpos=strmov(strpos,quote_name(row[SHOW_FIELDNAME],name_buff));
		}
		numFields = (uint) mysql_num_rows(tableRes);
		mysql_free_result(tableRes);
		}
		else
		{
		/* fprintf(stderr, "%s: Can't set SQL_QUOTE_SHOW_CREATE option (%s)\n",
		my_progname, mysql_error(sock)); */

		sprintf(insert_pat,"show fields from %s",table_name);
		if (mysql_query(sock,insert_pat) \|\| !(tableRes=mysql_store_result(sock)))
		{
		@@ -765,6 +846,7 @@ static uint getTableStructure(char table, char db)
		}
		fputs(";\n", sql_file);
		}
		}
		if (cFlag)
		{
		strpos=strmov(strpos,") VALUES ");

configure.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ SHARED_LIB_VERSION=10:0:0
		# Remember that regexps needs to quote [ and ] since this is run through m4
		MYSQL_NO_DASH_VERSION=`echo $VERSION \| sed -e "s\|-.*$\|\|"`
		MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION \| sed -e "s\|\.[[^.]]*$\|\|"`
		F_PART=`echo $MYSQL_BASE_VERSION \| sed -e "s\|\.\|\|g"\| sed -e "s\|[[a-zA-Z]]\+\|\|"`
		F_PART=`echo $MYSQL_BASE_VERSION \| sed -e "s\|\.\|\|g"\| sed -e "s\|[a-zA-Z]\+\|\|"\|sed -e "s\|^$..$$\|\\10\|"`
		L_PART=`echo $MYSQL_NO_DASH_VERSION \| sed -e "s\|^[[0-9]]\.[[0-9]]*\.\|\|" \| sed -e "s\|^$.$$\|0\\1\|" \| sed -e "s\|[[a-z]]\|\|"`
		MYSQL_VERSION_ID=${F_PART}${L_PART}

include/ft_global.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ FT_DOCLIST * ft_init_search(void , uint, byte , uint, my_bool);
		int ft_read_next(FT_DOCLIST , char );
		#define ft_close_search(handler) my_free(((gptr)(handler)),MYF(0))
		#define ft_get_relevance(handler) ((handler)->doc[(handler)->curdoc].weight)
		#define ft_reinit_search(handler) (((FT_DOCLIST *)(handler))->curdoc=-1)

		#ifdef __cplusplus
		}