diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-28 23:24:19 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 23:24:19 +0200 |
| commit | 8fa14ba6e6c6e7360d0799d703a5af26e2c2c61f (patch) | |
| tree | 75980cadd9828e2e2a062fd487670cbf759e72fe | |
| parent | 5df39c48f86639c76f14ae54baf805d2324afd37 (diff) | |
| download | mariadb-git-8fa14ba6e6c6e7360d0799d703a5af26e2c2c61f.tar.gz | |
Get rid of compiler warnings
mysql-test/suite/parts/t/partition_alter4_innodb.test:
Removed duplicated big_test marker
sql-common/my_time.c:
Get rid of compiler warning about uninitialized members
| -rw-r--r-- | mysql-test/suite/parts/t/partition_alter4_innodb.test | 2 | ||||
| -rw-r--r-- | sql-common/my_time.c | 3 | ||||
| -rw-r--r-- | storage/pbxt/src/table_xt.cc | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/suite/parts/t/partition_alter4_innodb.test b/mysql-test/suite/parts/t/partition_alter4_innodb.test index 624c1a0d6b8..cf4bd610ff1 100644 --- a/mysql-test/suite/parts/t/partition_alter4_innodb.test +++ b/mysql-test/suite/parts/t/partition_alter4_innodb.test @@ -22,8 +22,6 @@ # any of the variables. # ---source include/big_test.inc - #------------------------------------------------------------------------------# # General not engine specific settings and requirements diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 95078a50097..0408ea1e11f 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -727,6 +727,9 @@ void my_init_time(void) my_time.hour= (uint) l_time->tm_hour; my_time.minute= (uint) l_time->tm_min; my_time.second= (uint) l_time->tm_sec; + my_time.neg= 0; + my_time.second_part= 0; + my_time.time_type= MYSQL_TIMESTAMP_DATETIME; my_system_gmt_sec(&my_time, &my_time_zone, ¬_used); /* Init my_time_zone */ } diff --git a/storage/pbxt/src/table_xt.cc b/storage/pbxt/src/table_xt.cc index 30b844a9184..35b4ea3be3d 100644 --- a/storage/pbxt/src/table_xt.cc +++ b/storage/pbxt/src/table_xt.cc @@ -726,7 +726,7 @@ xtPublic void xt_check_tables(XTThreadPtr self) { u_int edx; XTTableEntryPtr te_ptr; - volatile XTTableHPtr tab; + volatile XTTableHPtr tab= 0; char path[PATH_MAX]; enter_(); @@ -1132,7 +1132,7 @@ static int tab_new_handle(XTThreadPtr self, XTTableHPtr *r_tab, XTDatabaseHPtr d XTOpenFilePtr of_rec, of_ind; XTTableEntryPtr te_ptr; size_t tab_format_offset; - size_t tab_head_size; + size_t tab_head_size= 0; enter_(); |