[Commits] c4b268a: InnoDB cleanup. Remove empty statements i.e. extra ; characters.

Jan Lindström jan.lindstrom at mariadb.com
Mon Mar 16 09:14:43 EET 2015


revision-id: c4b268add0475c6633f35eaf8cf4c7fbcad298f6
parent(s): da4b52432a773aaa1ec9a6e231b19f77595f69f7
committer: Jan Lindström
branch nick: 10.1-innodb-bug
timestamp: 2015-03-16 09:14:13 +0200
message:

InnoDB cleanup. Remove empty statements i.e. extra ; characters.

---
 storage/innobase/fil/fil0crypt.cc     | 2 +-
 storage/innobase/fil/fil0fil.cc       | 2 +-
 storage/innobase/handler/ha_innodb.cc | 2 +-
 storage/innobase/handler/i_s.cc       | 2 +-
 storage/xtradb/fil/fil0crypt.cc       | 2 +-
 storage/xtradb/fil/fil0fil.cc         | 2 +-
 storage/xtradb/handler/ha_innodb.cc   | 2 +-
 storage/xtradb/handler/i_s.cc         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
index 823c74a..10d49bb 100644
--- a/storage/innobase/fil/fil0crypt.cc
+++ b/storage/innobase/fil/fil0crypt.cc
@@ -734,7 +734,7 @@ fil_space_encrypt(ulint space, ulint offset, lsn_t lsn,
 	uint32 dstlen;
 
 	if (page_compressed) {
-		srclen = page_size -  FIL_PAGE_DATA;;
+		srclen = page_size -  FIL_PAGE_DATA;
 	}
 
 	int rc = (* my_aes_encrypt_dynamic)(src, srclen,
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index 750cb50..adc8f0b 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -5985,7 +5985,7 @@ fil_flush(
 	     node != NULL;
 	     node = UT_LIST_GET_NEXT(chain, node)) {
 
-		ib_int64_t old_mod_counter = node->modification_counter;;
+		ib_int64_t old_mod_counter = node->modification_counter;
 
 		if (old_mod_counter <= node->flush_counter) {
 			continue;
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index df443f9..3a5f961 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -11287,7 +11287,7 @@ ha_innobase::check_table_options(
 	const bool	use_tablespace, /*!< in: use file par table */
 	const ulint     file_format)
 {
-	enum row_type	row_format = table->s->row_type;;
+	enum row_type	row_format = table->s->row_type;
 	ha_table_option_struct *options= table->s->option_struct;
 	atomic_writes_t awrites = (atomic_writes_t)options->atomic_writes;
 
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index 3664c05..65fcb70 100644
--- a/storage/innobase/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
@@ -7683,7 +7683,7 @@ i_s_dict_fill_sys_tablespaces(
 {
 	Field**	fields;
 	ulint	atomic_blobs	= FSP_FLAGS_HAS_ATOMIC_BLOBS(flags);
-	ulint	page_size	= fsp_flags_get_page_size(flags);;
+	ulint	page_size	= fsp_flags_get_page_size(flags);
 	ulint	zip_size	= fsp_flags_get_zip_size(flags);
 	const char* file_format;
 	const char* row_format;
diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc
index 823c74a..10d49bb 100644
--- a/storage/xtradb/fil/fil0crypt.cc
+++ b/storage/xtradb/fil/fil0crypt.cc
@@ -734,7 +734,7 @@ fil_space_encrypt(ulint space, ulint offset, lsn_t lsn,
 	uint32 dstlen;
 
 	if (page_compressed) {
-		srclen = page_size -  FIL_PAGE_DATA;;
+		srclen = page_size -  FIL_PAGE_DATA;
 	}
 
 	int rc = (* my_aes_encrypt_dynamic)(src, srclen,
diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc
index d960950..b80685d 100644
--- a/storage/xtradb/fil/fil0fil.cc
+++ b/storage/xtradb/fil/fil0fil.cc
@@ -6052,7 +6052,7 @@ fil_flush(
 	     node != NULL;
 	     node = UT_LIST_GET_NEXT(chain, node)) {
 
-		ib_int64_t old_mod_counter = node->modification_counter;;
+		ib_int64_t old_mod_counter = node->modification_counter;
 
 		if (old_mod_counter <= node->flush_counter) {
 			continue;
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 0ad6af8..5cc232a 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -11793,7 +11793,7 @@ ha_innobase::check_table_options(
 	const bool	use_tablespace, /*!< in: use file par table */
 	const ulint     file_format)
 {
-	enum row_type	row_format = table->s->row_type;;
+	enum row_type	row_format = table->s->row_type;
 	ha_table_option_struct *options= table->s->option_struct;
 	atomic_writes_t awrites = (atomic_writes_t)options->atomic_writes;
 
diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc
index 6157156..20bc433 100644
--- a/storage/xtradb/handler/i_s.cc
+++ b/storage/xtradb/handler/i_s.cc
@@ -7651,7 +7651,7 @@ i_s_dict_fill_sys_tablespaces(
 {
 	Field**	fields;
 	ulint	atomic_blobs	= FSP_FLAGS_HAS_ATOMIC_BLOBS(flags);
-	ulint	page_size	= fsp_flags_get_page_size(flags);;
+	ulint	page_size	= fsp_flags_get_page_size(flags);
 	ulint	zip_size	= fsp_flags_get_zip_size(flags);
 	const char* file_format;
 	const char* row_format;


More information about the commits mailing list