mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal:/home/bk/mysql-5.0

Browse source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
This commit is contained in:
serg@serg.mylan 2005-02-23 00:13:02 +01:00
commit bd89c2d37e
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sql/ha_innodb.cc
View file

@ -1698,7 +1698,9 @@ innobase_rollback_to_savepoint(
innobase_release_stat_resources(trx);
/* TODO: use provided savepoint data area to store savepoint data */
char name[16]; sprintf(name, "s_%08lx", (ulong) savepoint);
char name[64];
longlong2str((ulonglong)savepoint,name,36);
error = trx_rollback_to_savepoint_for_mysql(trx, name,
&mysql_binlog_cache_pos);
DBUG_RETURN(convert_error_code_to_mysql(error, NULL));
@ -1724,7 +1726,9 @@ innobase_release_savepoint(
trx = check_trx_exists(thd);
/* TODO: use provided savepoint data area to store savepoint data */
char name[16]; sprintf(name, "s_%08lx", (ulong) savepoint);
char name[64];
longlong2str((ulonglong)savepoint,name,36);
error = trx_release_savepoint_for_mysql(trx, name);
DBUG_RETURN(convert_error_code_to_mysql(error, NULL));
@ -1763,7 +1767,9 @@ innobase_savepoint(
DBUG_ASSERT(trx->active_trans);
/* TODO: use provided savepoint data area to store savepoint data */
char name[16]; sprintf(name, "s_%08lx", (ulong) savepoint);
char name[64];
longlong2str((ulonglong)savepoint,name,36);
error = trx_savepoint_for_mysql(trx, name, (ib_longlong)0);
DBUG_RETURN(convert_error_code_to_mysql(error, NULL));

3
sql/sql_class.h
View file

@ -1072,7 +1072,8 @@ public:
MEM_ROOT mem_root; // Transaction-life memory allocation pool
void cleanup()
{
changed_tables = 0;
changed_tables= 0;
savepoints= 0;
#ifdef USING_TRANSACTIONS
free_root(&mem_root,MYF(MY_KEEP_PREALLOC));
#endif