diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-15 09:56:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-15 09:56:03 +0300 |
| commit | 84db10f27bdb4c8d9edf7f554afdcd2a24e3285a (patch) | |
| tree | 5f9d5b22cdfee6f147274d85b279d98f8a1bb46b /sql/handler.h | |
| parent | 9aacda409db8606b985a93f675487943846cbc86 (diff) | |
| parent | ccaec18b3934ee384296b4597bdf462fac66c5a4 (diff) | |
| download | mariadb-git-84db10f27bdb4c8d9edf7f554afdcd2a24e3285a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index e3bfcaa1ed2..94c652359d2 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2,7 +2,7 @@ #define HANDLER_INCLUDED /* Copyright (c) 2000, 2019, Oracle and/or its affiliates. - Copyright (c) 2009, 2019, MariaDB + Copyright (c) 2009, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -4888,4 +4888,15 @@ void print_keydup_error(TABLE *table, KEY *key, myf errflag); int del_global_index_stat(THD *thd, TABLE* table, KEY* key_info); int del_global_table_stat(THD *thd, const LEX_CSTRING *db, const LEX_CSTRING *table); +#ifndef DBUG_OFF +/** Converts XID to string. + +@param[out] buf output buffer +@param[in] xid XID to convert + +@return pointer to converted string + +@note This does not need to be multi-byte safe or anything */ +char *xid_to_str(char *buf, const XID &xid); +#endif // !DBUG_OFF #endif /* HANDLER_INCLUDED */ |