• unknown's avatar
    Changes from the innodb-5.0-ss115 snapshot. · d61394cf
    unknown authored
     Fixed bugs:
     BUG#15991: "innodb-file-per-table + symlink database + rename = crash"
     BUG#15650: "DELETE with LEFT JOIN crashes server"
     BUG#15308: "Problem of Order with Enum Column in Primary Key"
     BUG#14189: "VARBINARY and BINARY variables: trailing space ignored"
    
    
    innobase/include/data0type.h:
      Changes from the innodb-5.0-ss115 snapshot.
    innobase/include/data0type.ic:
      Changes from the innodb-5.0-ss115 snapshot.
       Fixed bug #14189. dtype_get_pad_char(): Do not pad VARBINARY
       or BINARY cloumns.
    innobase/include/lock0lock.h:
      Changes from the innodb-5.0-ss115 snapshot.
    innobase/include/os0file.h:
      Changes from the innodb-5.0-ss115 snapshot.
       os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and
       EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as
       OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when
       the .ibd file is a symbolic link to a different file system
       (bug#15991).
    innobase/include/row0mysql.h:
      Changes from the innodb-5.0-ss115 snapshot.
    innobase/lock/lock0lock.c:
      Changes from the innodb-5.0-ss115 snapshot.
       lock_rec_unlock(): Initialize local variable release_lock,
       in order to avoid dereferencing an uninitialized pointer
       when no lock exists on rec.
    innobase/os/os0file.c:
      Changes from the innodb-5.0-ss115 snapshot.
       os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and
         EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as
         OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when
         the .ibd file is a symbolic link to a different file system
         (bug#15991).
       Protect the increment and decrement operations on the statistic
         variables os_n_pending_writes/reads with os_file_count_mutes.
    innobase/row/row0ins.c:
      Changes from the innodb-5.0-ss115 snapshot.
       Fixed bug #14189. row_ins_cascade_calc_update_vec(): Refuse
       ON UPDATE_CASCADE when trying to change the length of of a
       VARBINARY column that refers to or is referenced by a BINARY
       column. BINARY columns are no longer padded on comparison,
       and thus they cannot be padded on storage either.
    innobase/row/row0mysql.c:
      Changes from the innodb-5.0-ss115 snapshot.
       Fixed bug on unlock_row. In a unlock_row we may unlock
       only the latest lock granted to this transaction to the row.
    innobase/row/row0sel.c:
      Changes from the innodb-5.0-ss115 snapshot.
       Fixed bug #15308.
       Fixed bug #14189: innobase_init(): Assert that
         DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number.
       After review fixes for unlock bug where unlock released all
         locks transaction requested for a row. Only a latest requested
         lock to a row should be released. Update function comments to
         reflect current state. Persistent cursor should be stored
         whenever select lock type != LOCK_NONE.
    innobase/trx/trx0trx.c:
      Changes from the innodb-5.0-ss115 snapshot.
       trx_commit_off_kernel(): Do not write empty trx->mysql_log_file_name.
    mysql-test/r/innodb.result:
      Changes from the innodb-5.0-ss115 snapshot.
    mysql-test/t/innodb.test:
      Changes from the innodb-5.0-ss115 snapshot.
    sql/ha_innodb.cc:
      Changes from the innodb-5.0-ss115 snapshot.
       Fixed bug #15308.
       Fixed bug #14189: innobase_init(): Assert that
         DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number.
       After review fixes for unlock bug where unlock released all
         locks transaction requested for a row. Only a latest requested
         lock to a row should be released. Update function comments to
         reflect current state. Persistent cursor should be stored
         whenever select lock type != LOCK_NONE.
    mysql-test/r/innodb_unsafe_binlog.result:
      Changes from the innodb-5.0-ss115 snapshot.
    mysql-test/t/innodb_unsafe_binlog-master.opt:
      Changes from the innodb-5.0-ss115 snapshot.
    mysql-test/t/innodb_unsafe_binlog.test:
      Changes from the innodb-5.0-ss115 snapshot.
       Added testcases for bug #15650.
    d61394cf
innodb_unsafe_binlog.result 1.56 KB
drop table if exists t1,t2;
create table t1 (id int not null, f_id int not null, f int not null,
primary key(f_id, id)) engine=innodb;
create table t2 (id int not null,s_id int not null,s varchar(200),
primary key(id)) engine=innodb;
INSERT INTO t1 VALUES (8, 1, 3);
INSERT INTO t1 VALUES (1, 2, 1);
INSERT INTO t2 VALUES (1, 0, '');
INSERT INTO t2 VALUES (8, 1, '');
commit;
DELETE ml.* FROM t1 AS ml LEFT JOIN t2 AS mm ON (mm.id=ml.id)
WHERE mm.id IS NULL;
select ml.* from t1 as ml left join t2 as mm on (mm.id=ml.id)
where mm.id is null lock in share mode;
id	f_id	f
drop table t1,t2;
create table t1 (id int not null, f_id int not null, f int not null,
primary key(id),key(f_id)) engine=innodb;
create table t2 (id int not null,s_id int not null,s varchar(200),
primary key(id),key(s_id)) engine=innodb;
INSERT INTO t1 VALUES (8, 1, 3);
INSERT INTO t1 VALUES (1, 2, 1);
INSERT INTO t2 VALUES (1, 0, '');
INSERT INTO t2 VALUES (8, 1, '');
commit;
delete ml.* from t1 as ml left join t2 as mm on (mm.s_id=ml.f_id) where mm.s is null;
select ml.* from t1 as ml left join t2 as mm on (mm.s_id=ml.f_id) where mm.s is null lock in share mode;
id	f_id	f
drop table t1,t2;
create table t1(a int not null, b int, primary key(a)) engine=innodb;
insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2);
commit;
set autocommit = 0;
select * from t1 lock in share mode;
a	b
1	1
2	2
3	1
4	2
5	1
6	2
update t1 set b = 5 where b = 1;
set autocommit = 0;
select * from t1 where a = 2 and b = 2 for update;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
commit;
commit;
drop table t1;