diff options
| author | unknown <brian@avenger.(none)> | 2004-11-30 10:10:40 -0800 |
|---|---|---|
| committer | unknown <brian@avenger.(none)> | 2004-11-30 10:10:40 -0800 |
| commit | 9ada34b3162d4650e8cbe11c705fd30a98981bd2 (patch) | |
| tree | 1f0afa7d9329a51b6fd4a5de7db6fbe43b47d328 /innobase/include/row0mysql.h | |
| parent | 409debfa14baf9a493edc9dd45364a7334d492f6 (diff) | |
| parent | be733ad13f5f6c196e9cd465cd32baf3e2faa75b (diff) | |
| download | mariadb-git-9ada34b3162d4650e8cbe11c705fd30a98981bd2.tar.gz | |
Merge for Matt for Innodb bug.
client/mysqldump.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ndb_index_unique.result:
Auto merged
mysql-test/r/rpl_start_stop_slave.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/ndb_grant.later:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
netware/comp_err.def:
Auto merged
netware/isamchk.def:
Auto merged
netware/isamlog.def:
Auto merged
netware/libmysql.def:
Auto merged
netware/my_print_defaults.def:
Auto merged
netware/myisam_ftdump.def:
Auto merged
netware/myisamchk.def:
Auto merged
netware/myisamlog.def:
Auto merged
netware/myisampack.def:
Auto merged
netware/mysql.def:
Auto merged
netware/mysql_install.def:
Auto merged
netware/mysql_install_db.def:
Auto merged
netware/mysql_test_run.def:
Auto merged
netware/mysql_waitpid.def:
Auto merged
netware/mysqladmin.def:
Auto merged
netware/mysqlbinlog.def:
Auto merged
netware/mysqlcheck.def:
Auto merged
netware/mysqld.def:
Auto merged
netware/mysqld_safe.def:
Auto merged
netware/mysqldump.def:
Auto merged
netware/mysqlimport.def:
Auto merged
netware/mysqlshow.def:
Auto merged
netware/mysqltest.def:
Auto merged
netware/pack_isam.def:
Auto merged
netware/perror.def:
Auto merged
netware/replace.def:
Auto merged
netware/resolve_stack_dump.def:
Auto merged
netware/resolveip.def:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
client/mysqladmin.cc:
Merge for Netware changes. Indention fixes.
sql/field.cc:
Merge fixes, warnings added from 4.1 to 5.0
sql/mysqld.cc:
Merge fixes, just indention fixes.
Diffstat (limited to 'innobase/include/row0mysql.h')
| -rw-r--r-- | innobase/include/row0mysql.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h index d4634482752..ea6d26b46fa 100644 --- a/innobase/include/row0mysql.h +++ b/innobase/include/row0mysql.h @@ -177,10 +177,12 @@ row_lock_table_for_mysql( /* out: error code or DB_SUCCESS */ row_prebuilt_t* prebuilt, /* in: prebuilt struct in the MySQL table handle */ - dict_table_t* table); /* in: table to LOCK_IX, or NULL + dict_table_t* table, /* in: table to lock, or NULL if prebuilt->table should be locked as LOCK_TABLE_EXP | prebuilt->select_lock_type */ + ulint mode); /* in: lock mode of table */ + /************************************************************************* Does an insert for MySQL. */ |