database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge mysql.com:/home/mydev/mysql-4.0-bug5390

Browse Source 
into  mysql.com:/home/mydev/mysql-4.1-bug5390


sql/table.h:
  Auto merged
mysql-test/r/lock.result:
  BUG#5390 - problems with merge tables
  Manual merge from 4.0.
mysql-test/t/lock.test:
  BUG#5390 - problems with merge tables
  Manual merge from 4.0.
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Manual merge from 4.0.
This commit is contained in:
unknown
2006-01-23 19:19:29 +01:00
parent 6d5674dcd3 15ecf9228a
commit cfbb86034d
4 changed files with 198 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/table.h
View File

@@ -138,6 +138,9 @@ struct st_table {
uint next_number_index;
uint blob_ptr_size; /* 4 or 8 */
uint next_number_key_offset;
uint lock_position; /* Position in MYSQL_LOCK.table */
uint lock_data_start; /* Start pos. in MYSQL_LOCK.locks */
uint lock_count; /* Number of locks */
int current_lock; /* Type of lock on table */
enum tmp_table_type tmp_table;
my_bool copy_blobs; /* copy_blobs when storing */