Commit f6de082b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


myisam/myisampack.c:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysys/list.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged
parents 219c84fa 000a09ba

include/my_list.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ extern void list_free(LIST *root,unsigned int free_data); 
extern unsigned int list_length(LIST *);

extern int list_walk(LIST *,list_walk_action action,gptr argument);



#define rest(a) ((a)->next)

#define list_rest(a) ((a)->next)

#define list_push(a,b) (a)=list_cons((b),(a))

#define list_pop(A) {LIST *old=(A); (A)=list_delete(old,old) ; my_free((gptr) old,MYF(MY_FAE)); }

myisam/myisampack.c

+8 −0
Original line number Diff line number Diff line
@@ -695,14 +695,22 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table) 
	  else

	    error=my_rename(new_name,org_name,MYF(MY_WME));

	  if (!error)

          {

	    VOID(my_copystat(temp_name,org_name,MYF(MY_COPYTIME)));

            if (tmp_dir[0])

              VOID(my_delete(new_name,MYF(MY_WME)));

          }

	}

      }

      else

      {

	if (tmp_dir[0])

        {

	  error=my_copy(new_name,org_name,

			MYF(MY_WME | MY_HOLD_ORIGINAL_MODES | MY_COPYTIME));

          if (!error)

            VOID(my_delete(new_name,MYF(MY_WME)));

        }

	else

	  error=my_redel(org_name,new_name,MYF(MY_WME | MY_COPYTIME));

      }

mysql-test/r/metadata.result

+11 −0
Original line number Diff line number Diff line
@@ -85,3 +85,14 @@ def aaa 1 1 8 20 1 N 32769 0 63 
1

1

drop table t1;

create table t1 (i int);

insert into t1 values (1),(2),(3);

select * from t1 where i = 2;

drop table t1;//

affected rows: 0

affected rows: 3

info: Records: 3  Duplicates: 0  Warnings: 0

i

2

affected rows: 1

affected rows: 0

mysql-test/t/metadata.test

+12 −0
Original line number Diff line number Diff line
@@ -49,4 +49,16 @@ drop table t1; 


--disable_metadata



#

# Bug #11688: Bad mysql_info() results in multi-results

#

--enable_info

delimiter //;

create table t1 (i int);

insert into t1 values (1),(2),(3);

select * from t1 where i = 2;

drop table t1;//

delimiter ;//

--disable_info



# End of 4.1 tests

mysys/list.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ int list_walk(LIST *list, list_walk_action action, gptr argument) 
  {

    if ((error = (*action)(list->data,argument)))

      return error;

    list=rest(list);

    list=list_rest(list);

  }

  return 0;

}