diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-22 11:15:47 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-22 11:15:47 +0200 |
| commit | 4ad6d6b6c9e551d84fe727d1f48edc8722098bfd (patch) | |
| tree | e305bc182a35eaf41802e4cc51a61bfd5bde5cd2 /storage/xtradb | |
| parent | 38e3787af4ac87274c7ef0e632a97aa1217e284a (diff) | |
| parent | 2c7d6f12ee10903c3002bba42ee15abc2b89fa8e (diff) | |
| download | mariadb-git-4ad6d6b6c9e551d84fe727d1f48edc8722098bfd.tar.gz | |
Merge in new handler and handlersocket code into 5.3 main
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/trx/trx0sys.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 39621852c4c..f0a62d10617 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -1480,7 +1480,7 @@ UNIV_INTERN ha_innobase::ha_innobase(handlerton *hton, TABLE_SHARE *table_arg) :handler(hton, table_arg), int_table_flags(HA_REC_NOT_IN_SEQ | - HA_NULL_IN_KEY | + HA_NULL_IN_KEY | HA_CAN_VIRTUAL_COLUMNS | HA_CAN_INDEX_BLOBS | HA_CAN_SQL_HANDLER | HA_PRIMARY_KEY_REQUIRED_FOR_POSITION | diff --git a/storage/xtradb/trx/trx0sys.c b/storage/xtradb/trx/trx0sys.c index 566f7c95793..a9fb5bb38d8 100644 --- a/storage/xtradb/trx/trx0sys.c +++ b/storage/xtradb/trx/trx0sys.c @@ -1667,7 +1667,7 @@ trx_sys_print_mysql_binlog_offset_from_page( /* THESE ARE COPIED FROM NON-HOTBACKUP PART OF THE INNODB SOURCE TREE - (This code duplicaton should be fixed at some point!) + (This code duplication should be fixed at some point!) */ #define TRX_SYS_SPACE 0 /* the SYSTEM tablespace */ |