diff options
author | unknown <jan@hundin.mysql.fi> | 2004-07-21 08:52:12 +0300 |
---|---|---|
committer | unknown <jan@hundin.mysql.fi> | 2004-07-21 08:52:12 +0300 |
commit | 9891d053559712110e4f4d9cccc39c409e42788a (patch) | |
tree | 1f631bc932932418044d890568d4784a5abd04f6 /innobase/srv | |
parent | bf95f9195fe431841fe1e29e6b82c9f47ec52ad3 (diff) | |
parent | 238b226f2626573021103872b85d54a79c5743ea (diff) | |
download | mariadb-git-9891d053559712110e4f4d9cccc39c409e42788a.tar.gz |
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
innobase/include/srv0srv.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'innobase/srv')
-rw-r--r-- | innobase/srv/srv0srv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 4bc5b0dc795..813adbc0e43 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -77,6 +77,10 @@ ibool srv_file_per_table = FALSE; /* store to its own file each table created by an user; data dictionary tables are in the system tablespace 0 */ +ibool srv_locks_unsafe_for_binlog = FALSE; /* Place locks to records only + i.e. do not use next-key locking + except on duplicate key checking and + foreign key checking */ ulint srv_n_data_files = 0; char** srv_data_file_names = NULL; ulint* srv_data_file_sizes = NULL; /* size in database pages */ |