From: vasil.dimov Date: August 23 2011 7:47am Subject: bzr push into mysql-trunk branch (vasil.dimov:3406 to 3407) List-Archive: http://lists.mysql.com/commits/140780 Message-Id: <20110823074732.5D9242E0CE@mail.v5d.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3407 Vasil Dimov 2011-08-23 Fix all occurences of C source filenames after they were renamed to .cc E.g. replace fil0fil.c with fil0fil.cc all over the source. modified: storage/innobase/CMakeLists.txt storage/innobase/fil/fil0fil.cc storage/innobase/fsp/fsp0fsp.cc storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/include/buf0buf.h storage/innobase/include/fil0fil.h storage/innobase/include/fsp0fsp.h storage/innobase/include/lock0priv.ic storage/innobase/include/rem0rec.h storage/innobase/include/rem0rec.ic storage/innobase/include/row0mysql.h storage/innobase/include/srv0mon.h storage/innobase/include/sync0rw.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0purge.h storage/innobase/include/trx0trx.h storage/innobase/include/univ.i storage/innobase/log/log0recv.cc storage/innobase/os/os0sync.cc storage/innobase/row/row0mysql.cc storage/innobase/row/row0sel.cc storage/innobase/row/row0upd.cc storage/innobase/srv/srv0start.cc storage/innobase/sync/sync0sync.cc 3406 Sunny Bains 2011-08-23 reinterpret_cast() should have been reinterpret_cast(). modified: storage/innobase/os/os0file.cc === modified file 'storage/innobase/CMakeLists.txt' --- a/storage/innobase/CMakeLists.txt revid:sunny.bains@stripped +++ b/storage/innobase/CMakeLists.txt revid:vasil.dimov@stripped @@ -207,7 +207,7 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug") # Sun Studio 12 crashes with -xO2 flag, but not with higher optimization # -xO3 - SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/rem/rem0rec.c + SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/rem/rem0rec.cc PROPERTIES COMPILE_FLAGS -xO3) ENDIF() === modified file 'storage/innobase/fil/fil0fil.cc' --- a/storage/innobase/fil/fil0fil.cc revid:sunny.bains@stripped +++ b/storage/innobase/fil/fil0fil.cc revid:vasil.dimov@stripped @@ -17,7 +17,7 @@ this program; if not, write to the Free *****************************************************************************/ /**************************************************//** -@file fil/fil0fil.c +@file fil/fil0fil.cc The tablespace memory cache Created 10/25/1995 Heikki Tuuri @@ -2147,7 +2147,7 @@ fil_op_log_parse_or_replay( /* Let us try to perform the file operation, if sensible. Note that ibbackup has at this stage already read in all space id info to the - fil0fil.c data structures. + fil0fil.cc data structures. NOTE that our algorithm is not guaranteed to work correctly if there were renames of tables during the backup. See ibbackup code for more @@ -3237,7 +3237,7 @@ fil_make_ibbackup_old_name( /********************************************************************//** Opens an .ibd file and adds the associated single-table tablespace to the -InnoDB fil0fil.c data structures. */ +InnoDB fil0fil.cc data structures. */ static void fil_load_single_table_tablespace( @@ -4574,7 +4574,7 @@ fil_io( /**********************************************************************//** Waits for an aio operation to complete. This function is used to write the handler for completed requests. The aio array of pending requests is divided -into segments (see os0file.c for more info). The thread specifies which +into segments (see os0file.cc for more info). The thread specifies which segment it wants to wait for. */ UNIV_INTERN void === modified file 'storage/innobase/fsp/fsp0fsp.cc' --- a/storage/innobase/fsp/fsp0fsp.cc revid:sunny.bains@stripped +++ b/storage/innobase/fsp/fsp0fsp.cc revid:vasil.dimov@stripped @@ -17,7 +17,7 @@ this program; if not, write to the Free *****************************************************************************/ /******************************************************************//** -@file fsp/fsp0fsp.c +@file fsp/fsp0fsp.cc File space management Created 11/29/1995 Heikki Tuuri @@ -924,7 +924,7 @@ fsp_init(void) /**********************************************************************//** Writes the space id and compressed page size to a tablespace header. -This function is used past the buffer pool when we in fil0fil.c create +This function is used past the buffer pool when we in fil0fil.cc create a new single-table tablespace. */ UNIV_INTERN void @@ -3055,7 +3055,7 @@ fsp_get_available_space_in_free_extents( However, there is one further complication, we release the fil_mutex when we need to invalidate the the pages in the buffer pool and we reacquire the fil_mutex when deleting and freeing the tablespace - instance in fil0fil.c. Here we need to account for that situation + instance in fil0fil.cc. Here we need to account for that situation too. */ mutex_enter(&dict_sys->mutex); === modified file 'storage/innobase/handler/ha_innodb.cc' --- a/storage/innobase/handler/ha_innodb.cc revid:sunny.bains@stripped +++ b/storage/innobase/handler/ha_innodb.cc revid:vasil.dimov@stripped @@ -4370,7 +4370,7 @@ set_field_in_record_to_null( /*************************************************************//** InnoDB uses this function to compare two data fields for which the data type is such that we must use MySQL code to compare them. NOTE that the prototype -of this function is in rem0cmp.c in InnoDB source code! If you change this +of this function is in rem0cmp.cc in InnoDB source code! If you change this function, remember to update the prototype there! @return 1, 0, -1, if a is greater, equal, less than b, respectively */ UNIV_INTERN @@ -7530,7 +7530,7 @@ ha_innobase::create( /* Latch the InnoDB data dictionary exclusively so that no deadlocks or lock waits can happen in it during a table create operation. - Drop table etc. do this latching in row0mysql.c. */ + Drop table etc. do this latching in row0mysql.cc. */ row_mysql_lock_data_dictionary(trx); @@ -8188,7 +8188,7 @@ ha_innobase::estimate_rows_upper_bound() /* Calculate a minimum length for a clustered index record and from that an upper bound for the number of rows. Since we only calculate - new statistics in row0mysql.c when a table has grown by a threshold + new statistics in row0mysql.cc when a table has grown by a threshold factor, we must add a safety factor 2 in front of the formula below. */ estimate = 2 * local_data_file_length / @@ -12439,7 +12439,7 @@ static MYSQL_SYSVAR_BOOL(file_format_che /* If a new file format is introduced, the file format name needs to be updated accordingly. Please refer to -file_format_name_map[] defined in trx0sys.c for the next +file_format_name_map[] defined in trx0sys.cc for the next file format name. */ static MYSQL_SYSVAR_STR(file_format_max, innobase_file_format_max, PLUGIN_VAR_OPCMDARG, === modified file 'storage/innobase/handler/i_s.cc' --- a/storage/innobase/handler/i_s.cc revid:sunny.bains@stripped +++ b/storage/innobase/handler/i_s.cc revid:vasil.dimov@stripped @@ -1373,11 +1373,11 @@ i_s_cmp_fill_low( table->field[0]->store(UNIV_ZIP_SIZE_MIN << i); /* The cumulated counts are not protected by any - mutex. Thus, some operation in page0zip.c could + mutex. Thus, some operation in page0zip.cc could increment a counter between the time we read it and clear it. We could introduce mutex protection, but it could cause a measureable performance hit in - page0zip.c. */ + page0zip.cc. */ table->field[1]->store(zip_stat->compressed); table->field[2]->store(zip_stat->compressed_ok); table->field[3]->store( === modified file 'storage/innobase/include/buf0buf.h' --- a/storage/innobase/include/buf0buf.h revid:sunny.bains@stripped +++ b/storage/innobase/include/buf0buf.h revid:vasil.dimov@stripped @@ -1651,7 +1651,7 @@ struct buf_block_struct{ - we know that buf_block_struct::buf_fix_count == 0. An exception to this is when we init or create a page - in the buffer pool in buf0buf.c. */ + in the buffer pool in buf0buf.cc. */ /* @{ */ @@ -1878,7 +1878,7 @@ struct buf_pool_struct{ ulint LRU_old_len; /*!< length of the LRU list from the block to which LRU_old points onward, including that block; - see buf0lru.c for the restrictions + see buf0lru.cc for the restrictions on this value; 0 if LRU_old == NULL; NOTE: LRU_old_len must be adjusted whenever LRU_old shrinks or grows! */ === modified file 'storage/innobase/include/fil0fil.h' --- a/storage/innobase/include/fil0fil.h revid:sunny.bains@stripped +++ b/storage/innobase/include/fil0fil.h revid:vasil.dimov@stripped @@ -647,7 +647,7 @@ fil_io( /**********************************************************************//** Waits for an aio operation to complete. This function is used to write the handler for completed requests. The aio array of pending requests is divided -into segments (see os0file.c for more info). The thread specifies which +into segments (see os0file.cc for more info). The thread specifies which segment it wants to wait for. */ UNIV_INTERN void === modified file 'storage/innobase/include/fsp0fsp.h' --- a/storage/innobase/include/fsp0fsp.h revid:sunny.bains@stripped +++ b/storage/innobase/include/fsp0fsp.h revid:vasil.dimov@stripped @@ -84,7 +84,7 @@ fsp_header_get_zip_size( const page_t* page); /*!< in: first page of a tablespace */ /**********************************************************************//** Writes the space id and compressed page size to a tablespace header. -This function is used past the buffer pool when we in fil0fil.c create +This function is used past the buffer pool when we in fil0fil.cc create a new single-table tablespace. */ UNIV_INTERN void === modified file 'storage/innobase/include/lock0priv.ic' --- a/storage/innobase/include/lock0priv.ic revid:sunny.bains@stripped +++ b/storage/innobase/include/lock0priv.ic revid:vasil.dimov@stripped @@ -24,8 +24,8 @@ Created July 16, 2007 Vasil Dimov *******************************************************/ /* This file contains only methods which are used in -lock/lock0* files, other than lock/lock0lock.c. -I.e. lock/lock0lock.c contains more internal inline +lock/lock0* files, other than lock/lock0lock.cc. +I.e. lock/lock0lock.cc contains more internal inline methods but they are used only in that file. */ #ifndef LOCK_MODULE_IMPLEMENTATION === modified file 'storage/innobase/include/rem0rec.h' --- a/storage/innobase/include/rem0rec.h revid:sunny.bains@stripped +++ b/storage/innobase/include/rem0rec.h revid:vasil.dimov@stripped @@ -54,7 +54,7 @@ in addition to the data and the offsets #define REC_STATUS_INFIMUM 2 #define REC_STATUS_SUPREMUM 3 -/* The following four constants are needed in page0zip.c in order to +/* The following four constants are needed in page0zip.cc in order to efficiently compress and decompress pages. */ /* The offset of heap_no in a compact record */ === modified file 'storage/innobase/include/rem0rec.ic' --- a/storage/innobase/include/rem0rec.ic revid:sunny.bains@stripped +++ b/storage/innobase/include/rem0rec.ic revid:vasil.dimov@stripped @@ -103,7 +103,7 @@ and the shift needed to obtain each bit- #define REC_OLD_HEAP_NO 5 #define REC_HEAP_NO_MASK 0xFFF8UL -#if 0 /* defined in rem0rec.h for use of page0zip.c */ +#if 0 /* defined in rem0rec.h for use of page0zip.cc */ #define REC_NEW_HEAP_NO 4 #define REC_HEAP_NO_SHIFT 3 #endif === modified file 'storage/innobase/include/row0mysql.h' --- a/storage/innobase/include/row0mysql.h revid:sunny.bains@stripped +++ b/storage/innobase/include/row0mysql.h revid:vasil.dimov@stripped @@ -116,7 +116,7 @@ row_mysql_pad_col( /**************************************************************//** Stores a non-SQL-NULL field given in the MySQL format in the InnoDB format. The counterpart of this function is row_sel_field_store_in_mysql_format() in -row0sel.c. +row0sel.cc. @return up to which byte we used buf in the conversion */ UNIV_INTERN byte* @@ -404,7 +404,7 @@ row_table_add_foreign_constraints( any foreign keys are found. */ /*********************************************************************//** -The master thread in srv0srv.c calls this regularly to drop tables which +The master thread in srv0srv.cc calls this regularly to drop tables which we must drop in background after queries to them have ended. Such lazy dropping of tables is needed in ALTER TABLE on Unix. @return how many tables dropped + remaining tables in list */ === modified file 'storage/innobase/include/srv0mon.h' --- a/storage/innobase/include/srv0mon.h revid:sunny.bains@stripped +++ b/storage/innobase/include/srv0mon.h revid:vasil.dimov@stripped @@ -114,7 +114,7 @@ naming rules here: 2) If the monitor uses exisitng counters from "status variable", its ID name shall start with MONITOR_OVLD -Please refer to "innodb_counter_info" in srv/srv0mon.c for detail +Please refer to "innodb_counter_info" in srv/srv0mon.cc for detail information for each monitor counter */ enum monitor_id_value { === modified file 'storage/innobase/include/sync0rw.h' --- a/storage/innobase/include/sync0rw.h revid:sunny.bains@stripped +++ b/storage/innobase/include/sync0rw.h revid:vasil.dimov@stripped @@ -591,7 +591,7 @@ struct rw_lock_struct { /*!< Thread id of writer thread. Is only guaranteed to have sane and non-stale value iff recursive flag is set. */ - os_event_t event; /*!< Used by sync0arr.c for thread queueing */ + os_event_t event; /*!< Used by sync0arr.cc for thread queueing */ os_event_t wait_ex_event; /*!< Event for next-writer to wait on. A thread must decrement lock_word before waiting. */ === modified file 'storage/innobase/include/sync0sync.h' --- a/storage/innobase/include/sync0sync.h revid:sunny.bains@stripped +++ b/storage/innobase/include/sync0sync.h revid:vasil.dimov@stripped @@ -728,7 +728,7 @@ implementation of a mutual exclusion sem /** InnoDB mutex */ struct mutex_struct { - os_event_t event; /*!< Used by sync0arr.c for the wait queue */ + os_event_t event; /*!< Used by sync0arr.cc for the wait queue */ volatile lock_word_t lock_word; /*!< lock_word is the target of the atomic test-and-set instruction when atomic operations are enabled. */ === modified file 'storage/innobase/include/trx0purge.h' --- a/storage/innobase/include/trx0purge.h revid:sunny.bains@stripped +++ b/storage/innobase/include/trx0purge.h revid:vasil.dimov@stripped @@ -130,7 +130,7 @@ struct trx_purge_struct{ necessarily purged from the indexes. Note that this can never be less than the limit below, we check for this - invariant in trx0purge.c */ + invariant in trx0purge.cc */ purge_iter_t limit; /* The 'purge pointer' which advances during a purge, and which is used in history list truncation */ === modified file 'storage/innobase/include/trx0trx.h' --- a/storage/innobase/include/trx0trx.h revid:sunny.bains@stripped +++ b/storage/innobase/include/trx0trx.h revid:vasil.dimov@stripped @@ -639,7 +639,7 @@ struct trx_struct{ /*!< If we notice that someone is waiting for our S-lock on the search latch to be released, we wait in - row0sel.c for BTR_SEA_TIMEOUT new + row0sel.cc for BTR_SEA_TIMEOUT new searches until we try to keep the search latch again over calls from MySQL; this is intended === modified file 'storage/innobase/include/univ.i' --- a/storage/innobase/include/univ.i revid:sunny.bains@stripped +++ b/storage/innobase/include/univ.i revid:vasil.dimov@stripped @@ -102,10 +102,10 @@ if we are compiling on Windows. */ # include #endif /* UNIV_HOTBACKUP */ -/* Include to get S_I... macros defined for os0file.c */ +/* Include to get S_I... macros defined for os0file.cc */ # include # if !defined(__WIN__) -# include /* mmap() for os0proc.c */ +# include /* mmap() for os0proc.cc */ # endif /* Include the header file generated by GNU autoconf */ @@ -221,7 +221,7 @@ operations (very slow); also UNIV_DEBUG #define UNIV_SEARCH_PERF_STAT /* statistics for the adaptive hash index */ #define UNIV_SRV_PRINT_LATCH_WAITS /* enable diagnostic output - in sync0sync.c */ + in sync0sync.cc */ #define UNIV_BTR_PRINT /* enable functions for printing B-trees */ #define UNIV_ZIP_DEBUG /* extensive consistency checks @@ -233,7 +233,7 @@ operations (very slow); also UNIV_DEBUG requests to the log. */ #define UNIV_STATS_DEBUG /* prints various stats related debug info from - dict0stats.c */ + dict0stats.cc */ #endif #ifdef HAVE_purify === modified file 'storage/innobase/log/log0recv.cc' --- a/storage/innobase/log/log0recv.cc revid:sunny.bains@stripped +++ b/storage/innobase/log/log0recv.cc revid:vasil.dimov@stripped @@ -17,7 +17,7 @@ Place, Suite 330, Boston, MA 02111-1307 *****************************************************************************/ /**************************************************//** -@file log/log0recv.c +@file log/log0recv.cc Recovery Created 9/20/1997 Heikki Tuuri @@ -1950,7 +1950,7 @@ recv_apply_log_recs_for_backup(void) } /* Read the page from the tablespace file using the - fil0fil.c routines */ + fil0fil.cc routines */ if (zip_size) { error = fil_io(OS_FILE_READ, TRUE, @@ -1984,7 +1984,7 @@ recv_apply_log_recs_for_backup(void) recv_recover_page(FALSE, block); /* Write the page back to the tablespace file using the - fil0fil.c routines */ + fil0fil.cc routines */ buf_flush_init_for_writing( block->frame, buf_block_get_page_zip(block), @@ -3314,7 +3314,7 @@ recv_recovery_rollback_active(void) themselves before we switch the latching order checks on */ os_thread_sleep(1000000); - /* Switch latching order checks on in sync0sync.c */ + /* Switch latching order checks on in sync0sync.cc */ sync_order_checks_on = TRUE; #endif /* Drop partially created indexes. */ === modified file 'storage/innobase/os/os0sync.cc' --- a/storage/innobase/os/os0sync.cc revid:sunny.bains@stripped +++ b/storage/innobase/os/os0sync.cc revid:vasil.dimov@stripped @@ -17,7 +17,7 @@ Place, Suite 330, Boston, MA 02111-1307 *****************************************************************************/ /**************************************************//** -@file os/os0sync.c +@file os/os0sync.cc The interface to the operating system synchronization primitives. @@ -39,7 +39,7 @@ Created 9/6/1995 Heikki Tuuri /* Type definition for an operating system mutex struct */ struct os_mutex_struct{ - os_event_t event; /*!< Used by sync0arr.c for queing threads */ + os_event_t event; /*!< Used by sync0arr.cc for queing threads */ void* handle; /*!< OS handle to mutex */ ulint count; /*!< we use this counter to check that the same thread does not === modified file 'storage/innobase/row/row0mysql.cc' --- a/storage/innobase/row/row0mysql.cc revid:sunny.bains@stripped +++ b/storage/innobase/row/row0mysql.cc revid:vasil.dimov@stripped @@ -17,7 +17,7 @@ this program; if not, write to the Free *****************************************************************************/ /**************************************************//** -@file row/row0mysql.c +@file row/row0mysql.cc Interface between Innobase row operations and MySQL. Contains also create table and other data dictionary operations. @@ -321,7 +321,7 @@ row_mysql_pad_col( /**************************************************************//** Stores a non-SQL-NULL field given in the MySQL format in the InnoDB format. The counterpart of this function is row_sel_field_store_in_mysql_format() in -row0sel.c. +row0sel.cc. @return up to which byte we used buf in the conversion */ UNIV_INTERN byte* @@ -472,7 +472,7 @@ row_mysql_store_col_in_innobase_format( be stored as "$%&a " (5 bytes). The string ".abc " will be stored as "$%&abc" (6 bytes). - The space padding will be restored in row0sel.c, function + The space padding will be restored in row0sel.cc, function row_sel_field_store_in_mysql_format(). */ ulint n_chars; @@ -498,7 +498,7 @@ row_mysql_store_col_in_innobase_format( /**************************************************************//** Convert a row in the MySQL format to a row in the Innobase format. Note that the function to convert a MySQL format key value to an InnoDB dtuple is -row_sel_convert_mysql_key_to_innobase() in row0sel.c. */ +row_sel_convert_mysql_key_to_innobase() in row0sel.cc. */ static void row_mysql_convert_row_to_innobase( @@ -2072,7 +2072,7 @@ row_create_index_for_mysql( trx_set_dict_operation(trx, TRX_DICT_OP_TABLE); /* Note that the space id where we store the index is inherited from - the table in dict_build_index_def_step() in dict0crea.c. */ + the table in dict_build_index_def_step() in dict0crea.cc. */ node = ind_create_graph_create(index, heap); @@ -2182,7 +2182,7 @@ in ALTER TABLE to the fact that the tabl table before all handles to it has been removed. Furhermore, the MySQL's call to drop table must be non-blocking. Therefore we do the drop table as a background operation, which is taken care of by the master thread -in srv0srv.c. +in srv0srv.cc. @return error code or DB_SUCCESS */ static int @@ -2223,7 +2223,7 @@ row_drop_table_for_mysql_in_background( } /*********************************************************************//** -The master thread in srv0srv.c calls this regularly to drop tables which +The master thread in srv0srv.cc calls this regularly to drop tables which we must drop in background after queries to them have ended. Such lazy dropping of tables is needed in ALTER TABLE on Unix. @return how many tables dropped + remaining tables in list */ @@ -2406,7 +2406,7 @@ row_discard_tablespace_for_mysql( 3) Insert buffer: we remove all entries for the tablespace in the insert buffer tree; as long as the tablespace mem object does not exist, ongoing insert buffer page merges are - discarded in buf0rea.c. If we recreate the tablespace mem + discarded in buf0rea.cc. If we recreate the tablespace mem object with IMPORT TABLESPACE later, then the tablespace will have the same id, but the tablespace_version field in the mem object is different, and ongoing old insert buffer page merges @@ -2836,7 +2836,7 @@ row_truncate_table_for_mysql( /* TODO: could we replace the counter n_foreign_key_checks_running with lock checks on the table? Acquire here an exclusive lock on the - table, and rewrite lock0lock.c and the lock wait in srv0srv.c so that + table, and rewrite lock0lock.cc and the lock wait in srv0srv.cc so that they can cope with the table having been truncated here? Foreign key checks take an IS or IX lock on the table. */ @@ -3225,7 +3225,7 @@ check_next_foreign: /* TODO: could we replace the counter n_foreign_key_checks_running with lock checks on the table? Acquire here an exclusive lock on the - table, and rewrite lock0lock.c and the lock wait in srv0srv.c so that + table, and rewrite lock0lock.cc and the lock wait in srv0srv.cc so that they can cope with the table having been dropped here? Foreign key checks take an IS or IX lock on the table. */ === modified file 'storage/innobase/row/row0sel.cc' --- a/storage/innobase/row/row0sel.cc revid:sunny.bains@stripped +++ b/storage/innobase/row/row0sel.cc revid:vasil.dimov@stripped @@ -24,7 +24,7 @@ Place, Suite 330, Boston, MA 02111-1307 *****************************************************************************/ /***************************************************//** -@file row/row0sel.c +@file row/row0sel.cc Select Created 12/19/1997 Heikki Tuuri @@ -850,7 +850,7 @@ row_sel_get_clust_rec( ut_a(node->read_view); /* In a rare case it is possible that no clust rec is found - for a delete-marked secondary index record: if in row0umod.c + for a delete-marked secondary index record: if in row0umod.cc in row_undo_mod_remove_clust_low() we have already removed the clust rec, while purge is still cleaning and removing secondary index records associated with earlier versions of @@ -2549,7 +2549,7 @@ row_sel_store_row_id_to_prebuilt( /**************************************************************//** Stores a non-SQL-NULL field in the MySQL format. The counterpart of this -function is row_mysql_store_col_in_innobase_format() in row0mysql.c. */ +function is row_mysql_store_col_in_innobase_format() in row0mysql.cc. */ static __attribute__((nonnull)) void row_sel_field_store_in_mysql_format_func( @@ -2700,7 +2700,7 @@ row_sel_field_store_in_mysql_format_func if (templ->mbminlen == 1 && templ->mbmaxlen != 1) { /* Pad with spaces. This undoes the stripping - done in row0mysql.c, function + done in row0mysql.cc, function row_mysql_store_col_in_innobase_format(). */ memset(dest + len, 0x20, templ->mysql_col_len - len); @@ -3044,7 +3044,7 @@ row_sel_get_clust_rec_for_mysql( < dict_index_get_n_unique(clust_index)) { /* In a rare case it is possible that no clust rec is found - for a delete-marked secondary index record: if in row0umod.c + for a delete-marked secondary index record: if in row0umod.cc in row_undo_mod_remove_clust_low() we have already removed the clust rec, while purge is still cleaning and removing secondary index records associated with earlier versions of @@ -4988,7 +4988,7 @@ lock_table_wait: on the same user record, we cannot use row_unlock_for_mysql() to unlock any records, and we must thus reset the new rec lock info. Since - in lock0lock.c we have blocked the inheriting of gap + in lock0lock.cc we have blocked the inheriting of gap X-locks, we actually do not have any new record locks set in this case. === modified file 'storage/innobase/row/row0upd.cc' --- a/storage/innobase/row/row0upd.cc revid:sunny.bains@stripped +++ b/storage/innobase/row/row0upd.cc revid:vasil.dimov@stripped @@ -17,7 +17,7 @@ Place, Suite 330, Boston, MA 02111-1307 *****************************************************************************/ /**************************************************//** -@file row/row0upd.c +@file row/row0upd.cc Update of a row Created 12/27/1996 Heikki Tuuri @@ -815,7 +815,7 @@ row_upd_build_sec_rec_difference_binary( and also in the case where we have a column prefix index and the last characters in the index field are spaces; the latter case probably caused the assertion failures reported at - row0upd.c line 713 in versions 4.0.14 - 4.0.16. */ + row0upd.cc line 713 in versions 4.0.14 - 4.0.16. */ /* NOTE: we compare the fields as binary strings! (No collation) */ === modified file 'storage/innobase/srv/srv0start.cc' --- a/storage/innobase/srv/srv0start.cc revid:sunny.bains@stripped +++ b/storage/innobase/srv/srv0start.cc revid:vasil.dimov@stripped @@ -32,7 +32,7 @@ Place, Suite 330, Boston, MA 02111-1307 *****************************************************************************/ /********************************************************************//** -@file srv/srv0start.c +@file srv/srv0start.cc Starts the InnoDB database server Created 2/16/1996 Heikki Tuuri @@ -2114,7 +2114,7 @@ innobase_start_or_create_for_mysql(void) /* Note: When creating the extra rollback segments during an upgrade we violate the latching order, even if the change buffer is empty. - We make an exception in sync0sync.c and check srv_is_being_started + We make an exception in sync0sync.cc and check srv_is_being_started for that violation. It cannot create a deadlock because we are still running in single threaded mode essentially. Only the IO threads should be running at this stage. */ === modified file 'storage/innobase/sync/sync0sync.cc' --- a/storage/innobase/sync/sync0sync.cc revid:sunny.bains@stripped +++ b/storage/innobase/sync/sync0sync.cc revid:vasil.dimov@stripped @@ -24,7 +24,7 @@ Place, Suite 330, Boston, MA 02111-1307 *****************************************************************************/ /**************************************************//** -@file sync/sync0sync.c +@file sync/sync0sync.cc Mutex, the basic synchronization primitive Created 9/5/1995 Heikki Tuuri @@ -1608,7 +1608,7 @@ sync_close(void) #ifdef UNIV_SYNC_DEBUG mutex_free(&sync_thread_mutex); - /* Switch latching order checks on in sync0sync.c */ + /* Switch latching order checks on in sync0sync.cc */ sync_order_checks_on = FALSE; sync_thread_level_arrays_free(); No bundle (reason: useless for push emails).