Merge lp:~laurynas-biveinis/percona-server/bug902467 into lp:percona-server/5.1

[Laurynas Biveinis]

Fix bug 902467:

os/os0file.c: In function ‘os_aio_simulated_wake_handler_thread’:
os/os0file.c:3596:9: error: variable ‘segment’ set but not used
[-Werror=unused-but-set-variable]
os/os0file.c: In function ‘os_aio_simulated_handle’:
os/os0file.c:4081:9: error: variable ‘segment’ set but not used
[-Werror=unused-but-set-variable]

log.cc: In member function ‘bool LOGGER::slow_log_print(THD*, const
char*, uint, ulonglong)’:
log.cc:998:12: error: variable ‘current_time’ set but not used
[-Werror=unused-but-set-variable]

sql_show.cc: In function ‘int store_create_info(THD*, TABLE_LIST*,
String*, HA_CREATE_INFO*, bool)’:
sql_show.cc:1254:8: error: variable ‘show_table_options’ set but not
used [-Werror=unused-but-set-variable]

The fix is to remove those variables, or, in case of
show_table_options, surround with the same #ifdef guard as the code
that uses the value.

[Laurynas Biveinis (laurynas-biveinis)]

Jenkins results:
http://jenkins.percona.com/job/percona-server-5.1-param/214/

The Oneiric debug testing now works. The rest of failures is the usual headache.

[Alexey Kopytov (akopytov)]

OK to merge, thanks.

review: Approve

=== modified file 'Percona-Server/sql/log.cc'
--- Percona-Server/sql/log.cc	2011-11-24 02:01:54 +0000
+++ Percona-Server/sql/log.cc	2011-12-16 12:23:26 +0000
@@ -995,8 +995,6 @@
 
   if (*slow_log_handler_list)
   {
-    time_t current_time;
-
     /* do not log slow queries from replication threads */
     if (thd->slave_thread && !opt_log_slow_slave_statements)
       return 0;
@@ -1016,7 +1014,6 @@
                              sctx->ip ? sctx->ip : "", "]", NullS) -
                     user_host_buff);
 
-    current_time= my_time_possible_from_micro(current_utime);
     if (thd->start_utime)
     {
       if(current_utime < thd->start_utime)

=== modified file 'Percona-Server/sql/sql_show.cc'
--- Percona-Server/sql/sql_show.cc	2011-11-24 02:01:17 +0000
+++ Percona-Server/sql/sql_show.cc	2011-12-16 12:23:26 +0000
@@ -1251,7 +1251,9 @@
   handler *file= table->file;
   TABLE_SHARE *share= table->s;
   HA_CREATE_INFO create_info;
+#ifdef WITH_PARTITION_STORAGE_ENGINE
   bool show_table_options= FALSE;
+#endif
   bool foreign_db_mode=  (thd->variables.sql_mode & (MODE_POSTGRESQL |
                                                      MODE_ORACLE |
                                                      MODE_MSSQL |
@@ -1466,7 +1468,9 @@
   packet->append(STRING_WITH_LEN("\n)"));
   if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) && !foreign_db_mode)
   {
+#ifdef WITH_PARTITION_STORAGE_ENGINE
     show_table_options= TRUE;
+#endif
     /*
       Get possible table space definitions and append them
       to the CREATE TABLE statement

=== modified file 'Percona-Server/storage/innodb_plugin/os/os0file.c'
--- Percona-Server/storage/innodb_plugin/os/os0file.c	2011-11-24 02:01:35 +0000
+++ Percona-Server/storage/innodb_plugin/os/os0file.c	2011-12-16 12:23:26 +0000
@@ -3593,13 +3593,12 @@
 {
 	os_aio_array_t*	array;
 	os_aio_slot_t*	slot;
-	ulint		segment;
 	ulint		n;
 	ulint		i;
 
 	ut_ad(!os_aio_use_native_aio);
 
-	segment = os_aio_get_array_and_local_segment(&array, global_segment);
+	os_aio_get_array_and_local_segment(&array, global_segment);
 
 	n = array->n_slots;
 
@@ -4078,7 +4077,6 @@
 	ulint*	space_id)
 {
 	os_aio_array_t*	array;
-	ulint		segment;
 	os_aio_slot_t*	slot;
 	os_aio_slot_t*	slot2;
 	os_aio_slot_t*	consecutive_ios[OS_AIO_MERGE_N_CONSECUTIVE];
@@ -4101,7 +4099,7 @@
 	/* Fix compiler warning */
 	*consecutive_ios = NULL;
 
-	segment = os_aio_get_array_and_local_segment(&array, global_segment);
+	os_aio_get_array_and_local_segment(&array, global_segment);
 
 restart:
 	/* NOTE! We only access constant fields in os_aio_array. Therefore
@@ -4110,7 +4108,6 @@
 	srv_set_io_thread_op_info(global_segment,
 				  "looking for i/o requests (a)");
 	ut_ad(os_aio_validate());
-	ut_ad(segment < array->n_segments);
 
 	n = array->n_slots;