List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:August 29 2011 12:59pm
Subject:bzr push into mysql-trunk branch (vasil.dimov:3417 to 3418)
View as plain text  
 3418 Vasil Dimov	2011-08-29
      Fix compilation warnings when compiling with UNIV_COMPILE_TEST_FUNCS.

    modified:
      storage/innobase/dict/dict0stats.c
      storage/innobase/row/row0row.c
 3417 Tor Didriksen	2011-08-29 [merge]
      local merge

    modified:
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/include/dict0dict.h
=== modified file 'storage/innobase/dict/dict0stats.c'
--- a/storage/innobase/dict/dict0stats.c	revid:tor.didriksen@stripped
+++ b/storage/innobase/dict/dict0stats.c	revid:vasil.dimov@stripped
@@ -2797,7 +2797,7 @@ test_dict_stats_save()
 	enum db_err	ret;
 
 	/* craft a dummy dict_table_t */
-	table.name = TEST_DATABASE_NAME "/" TEST_TABLE_NAME;
+	table.name = (char*) (TEST_DATABASE_NAME "/" TEST_TABLE_NAME);
 	table.stat_n_rows = TEST_N_ROWS;
 	table.stat_clustered_index_size = TEST_CLUSTERED_INDEX_SIZE;
 	table.stat_sum_of_other_index_sizes = TEST_SUM_OF_OTHER_INDEX_SIZES;
@@ -2961,7 +2961,7 @@ test_dict_stats_fetch_from_ps()
 	enum db_err	ret;
 
 	/* craft a dummy dict_table_t */
-	table.name = TEST_DATABASE_NAME "/" TEST_TABLE_NAME;
+	table.name = (char*) (TEST_DATABASE_NAME "/" TEST_TABLE_NAME);
 	UT_LIST_INIT(table.indexes);
 	UT_LIST_ADD_LAST(indexes, table.indexes, &index1);
 	UT_LIST_ADD_LAST(indexes, table.indexes, &index2);

=== modified file 'storage/innobase/row/row0row.c'
--- a/storage/innobase/row/row0row.c	revid:tor.didriksen@stripped
+++ b/storage/innobase/row/row0row.c	revid:vasil.dimov@stripped
@@ -1024,6 +1024,8 @@ test_row_raw_format_int()
 	ulint	ret;
 	char	buf[128];
 	ibool	format_in_hex;
+	speedo_t speedo;
+	ulint	i;
 
 #define CALL_AND_TEST(data, data_len, prtype, buf, buf_size,\
 		      ret_expected, buf_expected, format_in_hex_expected)\
@@ -1206,9 +1208,6 @@ test_row_raw_format_int()
 
 	/* speed test */
 
-	speedo_t	speedo;
-	ulint		i;
-
 	speedo_reset(&speedo);
 
 	for (i = 0; i < 1000000; i++) {

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (vasil.dimov:3417 to 3418) vasil.dimov29 Aug