Merge from innodb-branches-innodb+

This commit is contained in:
Vasil Dimov 2010-04-22 12:00:59 +03:00
commit f875041fad
13 changed files with 484 additions and 376 deletions

View file

@ -381,6 +381,9 @@ struct que_thr_struct{
thus far */
ulint lock_state; /*!< lock state of thread (table or
row) */
struct srv_slot_struct*
slot; /* The thread slot in the wait
array in srv_sys_t */
};
#define QUE_THR_MAGIC_N 8476583