diff options
author | unknown <vtkachenko@intelp4d.mysql.com> | 2004-12-24 13:31:21 +0100 |
---|---|---|
committer | unknown <vtkachenko@intelp4d.mysql.com> | 2004-12-24 13:31:21 +0100 |
commit | af22d870fae05614d893a0acd620e6bb369cc157 (patch) | |
tree | 4ce274ba9debdb9c94b4d925adc1aeda56ec9d2f /innobase | |
parent | 40d7e74efd94a62ca9d71a24f348e8ea5c3e4790 (diff) | |
download | mariadb-git-af22d870fae05614d893a0acd620e6bb369cc157.tar.gz |
Many files:
tabs replaced
ha_innodb.cc:
Comments removed
innobase/include/que0que.h:
tabs replaced
innobase/include/sync0rw.h:
tabs replaced
innobase/include/sync0sync.h:
tabs replaced
innobase/include/sync0sync.ic:
tabs replaced
innobase/row/row0sel.c:
tabs replaced
innobase/srv/srv0srv.c:
tabs replaced
innobase/sync/sync0rw.c:
tabs replaced
innobase/sync/sync0sync.c:
tabs replaced
sql/ha_innodb.cc:
Comments removed
sql/lex.h:
tabs replaced
sql/set_var.cc:
tabs replaced
sql/sql_parse.cc:
tabs replaced
sql/sql_yacc.yy:
tabs replaced
Diffstat (limited to 'innobase')
-rw-r--r-- | innobase/include/que0que.h | 8 | ||||
-rw-r--r-- | innobase/include/sync0rw.h | 6 | ||||
-rw-r--r-- | innobase/include/sync0sync.h | 12 | ||||
-rw-r--r-- | innobase/include/sync0sync.ic | 4 | ||||
-rw-r--r-- | innobase/row/row0sel.c | 2 | ||||
-rw-r--r-- | innobase/srv/srv0srv.c | 2 | ||||
-rw-r--r-- | innobase/sync/sync0rw.c | 4 | ||||
-rw-r--r-- | innobase/sync/sync0sync.c | 12 |
8 files changed, 25 insertions, 25 deletions
diff --git a/innobase/include/que0que.h b/innobase/include/que0que.h index d45ae032ddb..298ec494750 100644 --- a/innobase/include/que0que.h +++ b/innobase/include/que0que.h @@ -359,7 +359,7 @@ struct que_thr_struct{ the control came */ ulint resource; /* resource usage of the query thread thus far */ - ulint lock_state; /* lock state of thread (table or row) */ + ulint lock_state; /* lock state of thread (table or row) */ }; #define QUE_THR_MAGIC_N 8476583 @@ -484,9 +484,9 @@ struct que_fork_struct{ #define QUE_THR_ERROR 8 /* Query thread lock states */ -#define QUE_THR_LOCK_NOLOCK 0 -#define QUE_THR_LOCK_ROW 1 -#define QUE_THR_LOCK_TABLE 2 +#define QUE_THR_LOCK_NOLOCK 0 +#define QUE_THR_LOCK_ROW 1 +#define QUE_THR_LOCK_TABLE 2 /* From where the cursor position is counted */ #define QUE_CUR_NOT_DEFINED 1 diff --git a/innobase/include/sync0rw.h b/innobase/include/sync0rw.h index 6e3a4cf4dc7..bcf0749e05d 100644 --- a/innobase/include/sync0rw.h +++ b/innobase/include/sync0rw.h @@ -61,7 +61,7 @@ Creates, or rather, initializes an rw-lock object in a specified memory location (which must be appropriately aligned). The rw-lock is initialized to the non-locked state. Explicit freeing of the rw-lock with rw_lock_free is necessary only if the memory block containing it is freed. */ -#define rw_lock_create(L) rw_lock_create_func(\ +#define rw_lock_create(L) rw_lock_create_func(\ (L), __FILE__, __LINE__, __STRING(L)) /*=====================*/ @@ -76,8 +76,8 @@ rw_lock_create_func( /*================*/ rw_lock_t* lock, /* in: pointer to memory */ const char* cfile_name, /* in: file name where created */ - ulint cline, /* in: file line where created */ - const char* cmutex_name); /* in: mutex name */ + ulint cline, /* in: file line where created */ + const char* cmutex_name); /* in: mutex name */ /********************************************************************** Calling this function is obligatory only if the memory buffer containing the rw-lock is freed. Removes an rw-lock object from the global list. The diff --git a/innobase/include/sync0sync.h b/innobase/include/sync0sync.h index 98d61c129b1..600b12a5385 100644 --- a/innobase/include/sync0sync.h +++ b/innobase/include/sync0sync.h @@ -17,7 +17,7 @@ Created 9/5/1995 Heikki Tuuri #include "os0sync.h" #include "sync0arr.h" -extern my_bool timed_mutexes; +extern my_bool timed_mutexes; /********************************************************************** Initializes the synchronization data structures. */ @@ -50,8 +50,8 @@ mutex_create_func( /*==============*/ mutex_t* mutex, /* in: pointer to memory */ const char* cfile_name, /* in: file name where created */ - ulint cline, /* in: file line where created */ - const char* cmutex_name); /* in: mutex name */ + ulint cline, /* in: file line where created */ + const char* cmutex_name); /* in: mutex name */ /********************************************************************** Calling this function is obligatory only if the memory buffer containing the mutex is freed. Removes a mutex object from the mutex list. The mutex @@ -480,7 +480,7 @@ struct mutex_struct { ulong count_os_yield; /* count of os_wait */ ulonglong lspent_time; /* mutex os_wait timer msec */ ulonglong lmax_spent_time; /* mutex os_wait timer msec */ - const char* cmutex_name;/* mutex name */ + const char* cmutex_name;/* mutex name */ ulint mutex_type;/* 0 - usual mutex 1 - rw_lock mutex */ }; @@ -516,10 +516,10 @@ extern ibool sync_order_checks_on; extern ibool sync_initialized; /* Global list of database mutexes (not OS mutexes) created. */ -UT_LIST_BASE_NODE_T(mutex_t) mutex_list; +UT_LIST_BASE_NODE_T(mutex_t) mutex_list; /* Mutex protecting the mutex_list variable */ -mutex_t mutex_list_mutex; +mutex_t mutex_list_mutex; #ifndef UNIV_NONINL diff --git a/innobase/include/sync0sync.ic b/innobase/include/sync0sync.ic index 1731b47db58..f26f3788dc3 100644 --- a/innobase/include/sync0sync.ic +++ b/innobase/include/sync0sync.ic @@ -252,8 +252,8 @@ mutex_enter_func( mutex->count_using++; - if (!mutex_test_and_set(mutex)) - { + if (!mutex_test_and_set(mutex)) + { #ifdef UNIV_SYNC_DEBUG mutex_set_debug_info(mutex, file_name, line); #endif diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index c079557ca8b..9104d6e1f4f 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -3793,7 +3793,7 @@ lock_wait_or_error: thr->lock_state= QUE_THR_LOCK_ROW; was_lock_wait = row_mysql_handle_errors(&err, trx, thr, NULL); - thr->lock_state= QUE_THR_LOCK_NOLOCK; + thr->lock_state= QUE_THR_LOCK_NOLOCK; if (was_lock_wait) { mtr_start(&mtr); diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index aa2a7fa9169..49d4d346a0e 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -1384,7 +1384,7 @@ srv_suspend_mysql_thread( trx_t* trx; ibool had_dict_lock = FALSE; ibool was_declared_inside_innodb = FALSE; - ib_longlong start_time, finish_time; + ib_longlong start_time, finish_time; ulint diff_time; ulint sec; ulint ms; diff --git a/innobase/sync/sync0rw.c b/innobase/sync/sync0rw.c index e57974a375b..359945594be 100644 --- a/innobase/sync/sync0rw.c +++ b/innobase/sync/sync0rw.c @@ -90,8 +90,8 @@ rw_lock_create_func( /*================*/ rw_lock_t* lock, /* in: pointer to memory */ const char* cfile_name, /* in: file name where created */ - ulint cline, /* in: file line where created */ - const char* cmutex_name) /* in: mutex name */ + ulint cline, /* in: file line where created */ + const char* cmutex_name) /* in: mutex name */ { /* If this is the very first time a synchronization object is created, then the following call initializes diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index fb46c692830..317455f57a3 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -197,8 +197,8 @@ mutex_create_func( /*==============*/ mutex_t* mutex, /* in: pointer to memory */ const char* cfile_name, /* in: file name where created */ - ulint cline, /* in: file line where created */ - const char* cmutex_name) /* in: mutex name */ + ulint cline, /* in: file line where created */ + const char* cmutex_name) /* in: mutex name */ { #if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER) mutex_reset_lock_word(mutex); @@ -361,10 +361,10 @@ for the mutex before suspending the thread. */ void mutex_spin_wait( /*============*/ - mutex_t* mutex, /* in: pointer to mutex */ - const char* file_name, /* in: file name where - mutex requested */ - ulint line) /* in: line where requested */ + mutex_t* mutex, /* in: pointer to mutex */ + const char* file_name, /* in: file name where + mutex requested */ + ulint line) /* in: line where requested */ { ulint index; /* index of the reserved wait cell */ ulint i; /* spin round count */ |