diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2008-01-22 15:56:15 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2008-01-22 15:56:15 -0700 |
| commit | 6c26935035ce6fc646fc448dc181d9a3a870cd54 (patch) | |
| tree | 22de11d4d65b9eb7c56b5e80669f19cf9ff242f4 /client | |
| parent | 74c9f82afb1d145636b91eff4b26131fd60e4f68 (diff) | |
| parent | 37ff91b3bfdb946743e36ddd13bfda71598f45a8 (diff) | |
| download | mariadb-git-6c26935035ce6fc646fc448dc181d9a3a870cd54.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item_sum.cc:
Manual merge.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 5 | ||||
| -rw-r--r-- | client/mysqldump.c | 4 | ||||
| -rw-r--r-- | client/mysqltest.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 8f118a06935..1d673348f58 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3113,7 +3113,10 @@ com_connect(String *buffer, char *line) Two null bytes are needed in the end of buff to allow get_arg to find end of string the second time it's called. */ - strmake(buff, line, sizeof(buff)-2); + tmp= strmake(buff, line, sizeof(buff)-2); +#ifdef EXTRA_DEBUG + tmp[1]= 0; +#endif tmp= get_arg(buff, 0); if (tmp && *tmp) { diff --git a/client/mysqldump.c b/client/mysqldump.c index 01b484e924e..f119e0b40b0 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -590,7 +590,9 @@ static void write_header(FILE *sql_file, char *db_name) { if (opt_comments) { - fprintf(sql_file, "-- MySQL dump %s\n--\n", DUMP_VERSION); + fprintf(sql_file, + "-- MySQL dump %s Distrib %s, for %s (%s)\n--\n", + DUMP_VERSION, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE); fprintf(sql_file, "-- Host: %s Database: %s\n", current_host ? current_host : "localhost", db_name ? db_name : ""); diff --git a/client/mysqltest.c b/client/mysqltest.c index e0662fc2251..31e419244e6 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -3654,7 +3654,7 @@ void do_get_file_name(struct st_command *command, if (*p) *p++= 0; command->last_argument= p; - strmake(dest, name, dest_max_len); + strmake(dest, name, dest_max_len - 1); } @@ -6975,7 +6975,7 @@ int main(int argc, char **argv) if (save_file[0]) { - strmake(command->require_file, save_file, sizeof(save_file)); + strmake(command->require_file, save_file, sizeof(save_file) - 1); save_file[0]= 0; } run_query(cur_con, command, flags); |