diff options
Diffstat (limited to 'storage/innobase/include/ut0ut.h')
| -rw-r--r-- | storage/innobase/include/ut0ut.h | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h index 35b8a580e68..1260e0381bf 100644 --- a/storage/innobase/include/ut0ut.h +++ b/storage/innobase/include/ut0ut.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1994, 2012, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -65,16 +65,16 @@ typedef time_t ib_time_t; # elif defined(HAVE_FAKE_PAUSE_INSTRUCTION) # define UT_RELAX_CPU() __asm__ __volatile__ ("rep; nop") -# elif defined(HAVE_ATOMIC_BUILTINS) -# define UT_RELAX_CPU() do { \ - volatile lint volatile_var; \ - os_compare_and_swap_lint(&volatile_var, 0, 1); \ - } while (0) # elif defined(HAVE_WINDOWS_ATOMICS) /* In the Win32 API, the x86 PAUSE instruction is executed by calling the YieldProcessor macro defined in WinNT.h. It is a CPU architecture- independent way by using YieldProcessor. */ # define UT_RELAX_CPU() YieldProcessor() +# elif defined(HAVE_ATOMIC_BUILTINS) +# define UT_RELAX_CPU() do { \ + volatile lint volatile_var; \ + os_compare_and_swap_lint(&volatile_var, 0, 1); \ + } while (0) # else # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ # endif @@ -345,7 +345,7 @@ ut_print_filename( #ifndef UNIV_HOTBACKUP /* Forward declaration of transaction handle */ -struct trx_struct; +struct trx_t; /**********************************************************************//** Outputs a fixed-length string, quoted as an SQL identifier. @@ -357,7 +357,7 @@ void ut_print_name( /*==========*/ FILE* f, /*!< in: output stream */ - struct trx_struct*trx, /*!< in: transaction */ + const trx_t* trx, /*!< in: transaction */ ibool table_id,/*!< in: TRUE=print a table name, FALSE=print other identifier */ const char* name); /*!< in: name to print */ @@ -372,13 +372,31 @@ void ut_print_namel( /*===========*/ FILE* f, /*!< in: output stream */ - struct trx_struct*trx, /*!< in: transaction (NULL=no quotes) */ + const trx_t* trx, /*!< in: transaction (NULL=no quotes) */ ibool table_id,/*!< in: TRUE=print a table name, FALSE=print other identifier */ const char* name, /*!< in: name to print */ ulint namelen);/*!< in: length of name */ /**********************************************************************//** +Formats a table or index name, quoted as an SQL identifier. If the name +contains a slash '/', the result will contain two identifiers separated by +a period (.), as in SQL database_name.identifier. +@return pointer to 'formatted' */ +UNIV_INTERN +char* +ut_format_name( +/*===========*/ + const char* name, /*!< in: table or index name, must be + '\0'-terminated */ + ibool is_table, /*!< in: if TRUE then 'name' is a table + name */ + char* formatted, /*!< out: formatted result, will be + '\0'-terminated */ + ulint formatted_size);/*!< out: no more than this number of + bytes will be written to 'formatted' */ + +/**********************************************************************//** Catenate files. */ UNIV_INTERN void @@ -442,7 +460,7 @@ UNIV_INTERN const char* ut_strerr( /*======*/ - enum db_err num); /*!< in: error number */ + dberr_t num); /*!< in: error number */ /**************************************************************** Sort function for ulint arrays. */ |