Merge jcole@work.mysql.com:/home/bk/mysql (9fbfc785) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		jcole@tetra.bedford.progress.com
		jcole@tetra.spaceapes.com
		sasha@laptop.slkc.uswest.net
		sasha@mysql.sashanet.com
		sasha@work.mysql.com

+12 −1

Original line number	Diff line number	Diff line
		@@ -17683,7 +17683,7 @@ using @code{myisampack}. @xref{Compressed format}.
		@section @code{ALTER TABLE} Syntax

		@example
		ALTER [IGNORE] TABLE tbl_name alter_spec [, alter_spec ...]
		ALTER [IGNORE] TABLE tbl_name alter_spec [, alter_spec ...] [ORDER BY col]

		alter_specification:
		ADD [COLUMN] create_definition [FIRST \| AFTER column_name ]
		@@ -17832,6 +17832,14 @@ index exists, it drops the first @code{UNIQUE} index in the table.
		(@strong{MySQL} marks the first @code{UNIQUE} key as the @code{PRIMARY KEY}
		if no @code{PRIMARY KEY} was specified explicitly.)

		@findex ORDER BY
		@item
		@code{ORDER BY} allows you to create the new table with the rows in a
		specific order. Note that the table will not remain in this order after
		inserts and deletes. In some cases, it may make sorting easier for
		@strong{MySQL} if the table is in order by the column that you wish to
		order it by later.

		@findex ALTER TABLE
		@item
		If you use @code{ALTER TABLE} on a @code{MyISAM} table, all non-unique
		@@ -38312,6 +38320,9 @@ a temporary table
		@item
		@code{CHANGE MASTER TO} without specifying @code{MASTER_LOG_POS} would
		set it to 0 instead of 4 and hit the magic number in the master binlog.
		@item
		@code{ALTER TABLE ... ORDER BY ...} syntax added. This will create the
		new table with the rows in a specific order.

		@end itemize

+4 −0

Original line number	Diff line number	Diff line
		2000-11-11 Jeremy Cole <jeremy@mysql.com>

		* Added ALTER TABLE ... ORDER BY ...

		2000-09-17 Michael Widenius <monty@mysql.com>

		* Added option QUICK to DELETE to tell MySQL not to balance the

+5 −0

Original line number	Diff line number	Diff line
		@@ -268,6 +268,10 @@ bool net_store_data(String packet,const char from,uint length);
		bool net_store_data(String packet,struct tm tmp);
		bool net_store_data(String* packet, I_List<i_string>* str_list);

		SORT_FIELD * make_unireg_sortorder(ORDER order, uint length);
		int setup_order(THD thd,TABLE_LIST tables, List<Item> &fields,
		List <Item> &all_fields, ORDER *order);

		int mysql_select(THD thd,TABLE_LIST tables,List<Item> &list,COND *conds,
		List<Item_func_match> &ftfuncs,
		ORDER order, ORDER group,Item having,ORDER proc_param,
		@@ -294,6 +298,7 @@ int mysql_alter_table(THD thd, char new_db, char *new_name,
		List<create_field> &fields,
		List<Key> &keys,List<Alter_drop> &drop_list,
		List<Alter_column> &alter_list,
		ORDER *order,
		bool drop_primary,
		enum enum_duplicates handle_duplicates);
		bool mysql_rename_table(enum db_type base,

+2 −2

Original line number	Diff line number	Diff line
		@@ -1905,7 +1905,7 @@ int mysql_create_index(THD thd, TABLE_LIST table_list, List<Key> &keys)
		create_info.db_type=DB_TYPE_DEFAULT;
		DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->real_name,
		&create_info, table_list,
		fields, keys, drop, alter, FALSE, DUP_ERROR));
		fields, keys, drop, alter, (ORDER*)0, FALSE, DUP_ERROR));
		}


		@@ -1920,7 +1920,7 @@ int mysql_drop_index(THD thd, TABLE_LIST table_list, List<Alter_drop> &drop)
		create_info.db_type=DB_TYPE_DEFAULT;
		DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->real_name,
		&create_info, table_list,
		fields, keys, drop, alter, FALSE, DUP_ERROR));
		fields, keys, drop, alter, (ORDER*)0, FALSE, DUP_ERROR));
		}

		/*****************************************************************************