diff options
| author | unknown <gluh@eagle.(none)> | 2007-02-28 13:26:20 +0400 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-02-28 13:26:20 +0400 |
| commit | 53c5511a9bd471fa88724e865d5f310297974e3a (patch) | |
| tree | f7f3576f692325d3ab8f30fff347062b82509851 /storage | |
| parent | 8010d9872d16dde48c08bd3caf03c839401785a3 (diff) | |
| parent | ae72e394502e13b854b6e9bb00889fa6b69a7ed9 (diff) | |
| download | mariadb-git-53c5511a9bd471fa88724e865d5f310297974e3a.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/pars/lexyy.c | 2 | ||||
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 3 | ||||
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/storage/innobase/pars/lexyy.c b/storage/innobase/pars/lexyy.c index 70daf261186..b65de138573 100644 --- a/storage/innobase/pars/lexyy.c +++ b/storage/innobase/pars/lexyy.c @@ -1017,7 +1017,7 @@ YY_RULE_SETUP yylval = sym_tab_add_bound_lit(pars_sym_tab_global, yytext + 1, &type); - return(type); + return((int) type); } YY_BREAK case 4: diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 4392a456f60..d9e7e1d5700 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -460,6 +460,7 @@ void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info) { TABLE_LIST *ptr; LEX_STRING db, name; + LINT_INIT(db.str); if (!(ptr = (TABLE_LIST *) thd->calloc(sizeof(TABLE_LIST)))) goto err; @@ -570,6 +571,8 @@ void ha_myisammrg::append_create_info(String *packet) open_table++) { LEX_STRING db, name; + LINT_INIT(db.str); + split_file_name(open_table->table->filename, &db, &name); if (open_table != first) packet->append(','); diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp index cdba96e7503..52760dbbd36 100644 --- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp +++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp @@ -1338,6 +1338,7 @@ operator<<(NdbOut& out, const Gci_container& gci) return out; } +#ifdef VM_TRACE static NdbOut& operator<<(NdbOut& out, const Gci_container_pod& gci) @@ -1346,7 +1347,7 @@ operator<<(NdbOut& out, const Gci_container_pod& gci) out << *ptr; return out; } - +#endif static Gci_container* |