Removed not used variable 'last_ref'

Fixed problem with negative DECIMAL() keys
Fixed some bugs with NULL keys in BDB
More mysql-test tests

1 files changed, 28 insertions, 3 deletions

diff --git a/include/thr_lock.h b/include/thr_lock.h
index 288a762703d..569a09d7aa5 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -29,11 +29,36 @@ extern "C" {
 struct st_thr_lock;
 
 enum thr_lock_type { TL_IGNORE=-1,
-		     TL_UNLOCK, TL_READ,  TL_READ_HIGH_PRIORITY,
+		     TL_UNLOCK,			/* UNLOCK ANY LOCK */
+		     TL_READ,			/* Read lock */
+		     /* High prior. than TL_WRITE. Allow concurrent insert */
+		     TL_READ_HIGH_PRIORITY,
+		     /* READ, Don't allow concurrent insert */
 		     TL_READ_NO_INSERT,
-		     TL_WRITE_ALLOW_WRITE, TL_WRITE_ALLOW_READ,
+		     /* 
+			Write lock, but allow other threads to read / write.
+			Used by BDB tables in MySQL to mark that someone is
+			reading/writing to the table.
+		      */
+		     TL_WRITE_ALLOW_WRITE,
+		     /*
+			Write lock, but allow other threads to read / write.
+			Used by ALTER TABLE in MySQL to mark to allow readers
+			to use the table until ALTER TABLE is finished.
+		     */
+		     TL_WRITE_ALLOW_READ,
+		     /*
+		       WRITE lock used by concurrent insert. Will allow
+		       READ, if one could use concurrent insert on table.
+		     */
 		     TL_WRITE_CONCURRENT_INSERT,
-		     TL_WRITE_DELAYED, TL_WRITE_LOW_PRIORITY, TL_WRITE,
+		     /* Write used by INSERT DELAYED.  Allows READ locks */
+		     TL_WRITE_DELAYED,
+		     /* WRITE lock that has lower priority than TL_READ */
+		     TL_WRITE_LOW_PRIORITY,
+		     /* Normal WRITE lock */
+		     TL_WRITE,
+		     /* Abort new lock request with an error */
 		     TL_WRITE_ONLY};
 
 extern ulong max_write_lock_count;