Merge mysql.com:/home/jimw/my/mysql-5.1-release

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


mysql-test/t/alter_table.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/show_check.result:
  Resolve conflict
sql/authors.h:
  Resolve conflicts, update replication/backup developers

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 4a5c9452ffd..4b7a1fc00a8 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -784,9 +784,9 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
                   bool reset_auto_increment);
 bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok);
 bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create);
-uint create_table_def_key(THD *thd, byte *key, TABLE_LIST *table_list,
+uint create_table_def_key(THD *thd, char *key, TABLE_LIST *table_list,
                           bool tmp_table);
-TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, byte *key,
+TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, char *key,
                              uint key_length, uint db_flags, int *error);
 void release_table_share(TABLE_SHARE *share, enum release_type type);
 TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name);
@@ -1396,7 +1396,7 @@ int format_number(uint inputflag,uint max_length,my_string pos,uint length,
 		  my_string *errpos);
 
 /* table.cc */
-TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, byte *key,
+TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, char *key,
                                uint key_length);
 void init_tmp_table_share(TABLE_SHARE *share, const char *key, uint key_length,
                           const char *table_name, const char *path);