I re-ran the upgrade script and have a few database edits to do by hand - using phpmyadmin. I don't know anything about SQL or programming so I'm not 100% clear on what the error messages mean & exactly what to do about them!

1: user error: Multiple primary key defined

(from drupal update)
user error: Multiple primary key defined
query: ALTER TABLE term_node ADD PRIMARY KEY (tid,nid)
(from phphmyadmin)
Keyname  	Type  	Cardinality  	Action  	Field
PRIMARY 	PRIMARY 	707  	Edit 	Drop 	tid, nid
nid 	INDEX 	353  	Edit 	Drop 	nid
tid 	INDEX 	117  	Edit 	Drop 	tid
Warning PRIMARY and INDEX keys should not both be set for column `tid`

so it doesn't like both nid and tid being PRIMARY, and i should drop the tid from PRIMARY? I've tried to 'ignore' tid in the edit PRIMARY options, but it doesn't seem to hold the change. It also gives me the error "#1062 - Duplicate entry '218' for key 1 " which seems to mean that all values for nid index are set to 218(?).
Should I delete the PRIMARY key altogether and just make a new one? (if so how do I tell it which table to edit?)

2:user error: Unknown column 'voters' in 'poll'

(from drupal update)
user error: Unknown column 'voters' in 'poll'
query: ALTER TABLE poll CHANGE voters polled longtext
(from phpmyadmin)
 Field   	Type  	Attributes  	Null  	Default  	Extra  	
 nid  	int(10) 	UNSIGNED 	No  	0  	  	
 runtime  	int(10) 	  	No  	0  	  	
 polled  	longtext 	  	Yes  	NULL  	  	
 active  	int(2) 	UNSIGNED 	No  	0  	  	

I've no idea whatsoever with this one!

I just don't understand the MySQL Reference Manual! ... if anyone knows a help source on using phpmyadmin please let me know.

There are a couple more edits to do, but if I could get this one I hope I might be able to figure out the rest by myself.

copious thanks in advance