database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

branches/zip: Merge 1553:1556 from trunk.

Browse Source
This commit is contained in:
marko
2007-06-08 07:05:17 +00:00
parent d1bdef34ac
commit 2d90ae68e7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/innodb_trx_weight.inc
View File

@@ -1,5 +1,5 @@
-- connect (con1,localhost,,,)
-- connect (con2,localhost,,,)
-- connect (con1,localhost,root,,)
-- connect (con2,localhost,root,,)
-- connection con1
SET autocommit=0;

4
rem/rem0rec.c
View File

@@ -741,8 +741,8 @@ rec_get_converted_size_comp(
break;
case REC_STATUS_INFIMUM:
case REC_STATUS_SUPREMUM:
/* infimum or supremum record, 8 bytes */
return(8); /* no extra data needed */
/* infimum or supremum record, 8 data bytes */
return(REC_N_NEW_EXTRA_BYTES + 8);
default:
ut_error;
return(ULINT_UNDEFINED);