diff options
| author | unknown <serg@serg.mylan> | 2003-12-09 20:50:11 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-12-09 20:50:11 +0100 |
| commit | 6f1d63bfe0f7166709061c6f6ad07d00164ce6d8 (patch) | |
| tree | b8ee45262e3da0469b0169121bfbcb03b67c6557 /sql | |
| parent | 4e85bf326e8051533bb680d1a612813705dc789d (diff) | |
| parent | 7cfbf9e8f681eac207f8b37d12780f73ffa5dd70 (diff) | |
| download | mariadb-git-6f1d63bfe0f7166709061c6f6ad07d00164ce6d8.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/opt_range.cc | 2 | ||||
| -rw-r--r-- | sql/repl_failsafe.cc | 1 | ||||
| -rw-r--r-- | sql/table.cc | 5 |
4 files changed, 5 insertions, 7 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 70ee2f632ca..410a1644eec 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4634,14 +4634,14 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), my_use_symdir=0; break; case (int) OPT_BIND_ADDRESS: - if (argument && isdigit(argument[0])) + if (isdigit(argument[0])) { my_bind_addr = (ulong) inet_addr(argument); } else { struct hostent *ent; - if (argument || argument[0]) + if (argument[0]) ent=gethostbyname(argument); else { diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 63850709285..07f2f1eaf67 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2454,7 +2454,7 @@ QUICK_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table, TABLE_REF *ref) if (cp_buffer_from_ref(ref)) { if (thd->fatal_error) - return 0; // out of memory + goto err; // out of memory return quick; // empty range } diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 6b91d81b487..6599516044a 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -426,7 +426,6 @@ static Slave_log_event* find_slave_event(IO_CACHE* log, my_snprintf(errmsg, SLAVE_ERRMSG_SIZE, "Could not find slave event in log '%s'", (char*)log_file_name); - delete ev; return 0; } diff --git a/sql/table.cc b/sql/table.cc index 422202301f1..0789f7469e7 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1100,13 +1100,12 @@ rename_file_ext(const char * from,const char * to,const char * ext) char *get_field(MEM_ROOT *mem, TABLE *table, uint fieldnr) { Field *field=table->field[fieldnr]; - char buff[MAX_FIELD_WIDTH]; + char buff[MAX_FIELD_WIDTH], *to; String str(buff,sizeof(buff)); field->val_str(&str,&str); uint length=str.length(); - if (!length) + if (!length || !(to= (char*) alloc_root(mem,length+1))) return NullS; - char *to= (char*) alloc_root(mem,length+1); memcpy(to,str.ptr(),(uint) length); to[length]=0; return to; |