diff options
| author | unknown <guilhem@gbichot3.local> | 2006-07-06 17:56:26 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-07-06 17:56:26 +0200 |
| commit | b5faf11ab6149909b789d5fe62146ecc3fc78d33 (patch) | |
| tree | d15faacb0f09320e8438462607d96b7b0a6e0c76 /sql/sql_class.h | |
| parent | 986679a2870d84ae75ca01674a29279b44da532e (diff) | |
| parent | 81bb604c632cbc1b3bf8b151b7c62b4005abb6ca (diff) | |
| download | mariadb-git-b5faf11ab6149909b789d5fe62146ecc3fc78d33.tar.gz | |
Merge gbichot3.local:/home/mysql_src/mysql-5.1
into gbichot3.local:/home/mysql_src/mysql-5.1-new-WL3146-handler
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/rpl_row_create_table.result:
Auto merged
mysql-test/t/rpl_row_create_table.test:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 5222e75f309..9bc0c20b562 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1637,7 +1637,8 @@ public: virtual bool can_rollback_data() { return 1; } // Needed for access from local class MY_HOOKS in prepare(), since thd is proteted. - THD *get_thd(void) { return thd; } + const THD *get_thd(void) { return thd; } + const HA_CREATE_INFO *get_create_info() { return create_info; }; }; #include <myisam.h> |