diff options
author | unknown <dlenev@mysql.com> | 2005-11-19 15:11:57 +0300 |
---|---|---|
committer | unknown <dlenev@mysql.com> | 2005-11-19 15:11:57 +0300 |
commit | e2de3a8fc4432788b6e7fff6dce884b8eb7b1a44 (patch) | |
tree | 03a4051dfbf4ff6941306a61203be4a69e24499a /sql/sql_class.h | |
parent | 6ba79a251681a765f491db1428a467a0a06a69bd (diff) | |
parent | 11d4d7e6ff3c8b82e47bb62e26b1f10690daabb0 (diff) | |
download | mariadb-git-e2de3a8fc4432788b6e7fff6dce884b8eb7b1a44.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg13825
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index eaa8291e697..ed6f5732ca8 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1091,6 +1091,7 @@ public: uint in_sub_stmt; bool enable_slow_log, insert_id_used; my_bool no_send_ok; + SAVEPOINT *savepoints; }; |