diff options
| author | unknown <cps@outpost.site> | 2006-01-20 00:40:56 +0300 |
|---|---|---|
| committer | unknown <cps@outpost.site> | 2006-01-20 00:40:56 +0300 |
| commit | bd7120f97c0a71c82bf2887ec706f9d2d9f9e486 (patch) | |
| tree | 28cd30935740034f182297c4e2b41789106c0f0d /sql/ha_myisam.cc | |
| parent | 7dbb63fe209a3977367c6282e81052fbbd9980e6 (diff) | |
| download | mariadb-git-bd7120f97c0a71c82bf2887ec706f9d2d9f9e486.tar.gz | |
Fix the tree: plugin-related changes, necessary for
CSV storage engine to be statically compiled.
Derived from antony's patch.
config/ac-macros/storage.m4:
don't add objects to the object list if
we don't have them
configure.in:
compile CSV statically
sql/ha_myisam.cc:
fix prototype to get rid of THD
sql/ha_myisam.h:
fix prototype to get rid of THD
sql/handler.cc:
new function for plugins
sql/handler.h:
fix prototype to get rid of THD
declare functions used by plugins
sql/item.h:
Don't include all the types and files when not building mysqld
sql/lock.cc:
don's assume that handler knows about THD
sql/mysql_priv.h:
Don't include all the types and files when not building mysqld
declare new plugin functions
sql/sql_class.cc:
New plugin functions
sql/sql_class.h:
Don't include all the types and files when not building mysqld
sql/sql_lex.h:
Don't include all the types and files when not building mysqld
storage/csv/Makefile.am:
compile CSV into a static lib to be
linked into mysqld
storage/csv/ha_tina.cc:
fix ha_tina to be able to build it static
storage/csv/ha_tina.h:
fix prototype to get rid of THD
Diffstat (limited to 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 5ca22fbc7c7..06a9acf9761 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -296,7 +296,10 @@ err: #endif /* HAVE_REPLICATION */ -bool ha_myisam::check_if_locking_is_allowed(THD *thd, TABLE *table, uint count) +bool ha_myisam::check_if_locking_is_allowed(uint sql_command, + ulong type, TABLE *table, + uint count, + bool called_by_logger_thread) { /* To be able to open and lock for reading system tables like 'mysql.proc', |