diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/my_readline.h | 1 | ||||
| -rw-r--r-- | client/mysql.cc | 7 | ||||
| -rw-r--r-- | client/mysqladmin.c | 1 | ||||
| -rw-r--r-- | client/mysqldump.c | 13 | ||||
| -rw-r--r-- | client/mysqlimport.c | 2 | ||||
| -rw-r--r-- | client/mysqltest.c | 8 | ||||
| -rw-r--r-- | client/readline.cc | 9 |
7 files changed, 21 insertions, 20 deletions
diff --git a/client/my_readline.h b/client/my_readline.h index c9a0e863870..547587bc19d 100644 --- a/client/my_readline.h +++ b/client/my_readline.h @@ -26,6 +26,7 @@ typedef struct st_line_buffer uint bufread; /* Number of bytes to get with each read(). */ uint eof; ulong max_size; + ulong read_length; /* Length of last read string */ } LINE_BUFFER; extern LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file); diff --git a/client/mysql.cc b/client/mysql.cc index 30e7d75ecaa..dbd7bfbf899 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -39,7 +39,7 @@ #include "my_readline.h" #include <signal.h> -const char *VER="11.9"; +const char *VER="11.10"; gptr sql_alloc(unsigned size); // Don't use mysqld alloc for these void sql_element_free(void *ptr); @@ -903,7 +903,6 @@ static bool add_line(String &buffer,char *line,char *in_string) continue; #ifdef USE_MB int l; -/* if ((l = ismbchar(pos, pos+MBMAXLEN))) { Wei He: I think it's wrong! */ if (use_mb(default_charset_info) && (l = my_ismbchar(default_charset_info, pos, strend))) { while (l--) @@ -2163,7 +2162,9 @@ com_status(String *buffer __attribute__((unused)), tee_fprintf(stdout, "Server version:\t\t%s\n", mysql_get_server_info(&mysql)); tee_fprintf(stdout, "Protocol version:\t%d\n", mysql_get_proto_info(&mysql)); tee_fprintf(stdout, "Connection:\t\t%s\n", mysql_get_host_info(&mysql)); - tee_fprintf(stdout, "Language:\t\t%s\n", mysql.charset->name); + tee_fprintf(stdout, "Client characterset:\t%s\n", + default_charset_info->name); + tee_fprintf(stdout, "Server characterset:\t%s\n", mysql.charset->name); if (strstr(mysql_get_host_info(&mysql),"TCP/IP") || ! mysql.unix_socket) tee_fprintf(stdout, "TCP port:\t\t%d\n", mysql.port); else diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 6488d012c1a..35f7f341247 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -122,7 +122,6 @@ static struct option long_options[] = { {"socket", required_argument, 0, 'S'}, {"sleep", required_argument, 0, 'i'}, #include "sslopt-longopts.h" - {"connect-timeout", required_argument, 0, 't'}, #ifndef DONT_ALLOW_USER_CHANGE {"user", required_argument, 0, 'u'}, #endif diff --git a/client/mysqldump.c b/client/mysqldump.c index f27f5c5e35b..9c5c4d34ca5 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -37,7 +37,7 @@ ** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee> **/ -#define DUMP_VERSION "8.11" +#define DUMP_VERSION "8.12" #include <global.h> #include <my_sys.h> @@ -863,9 +863,14 @@ static char *add_load_option(char *ptr,const char *object, { if (object) { - ptr= strxmov(ptr," ",statement," '",NullS); - ptr= field_escape(ptr,object,(uint) strlen(object)); - *ptr++= '\''; + if (!strncasecmp(object,"0x",2)) /* hex constant; don't escape */ + ptr= strxmov(ptr," ",statement," ",object,NullS); + else /* char constant; escape */ + { + ptr= strxmov(ptr," ",statement," '",NullS); + ptr= field_escape(ptr,object,(uint) strlen(object)); + *ptr++= '\''; + } } return ptr; } /* add_load_option */ diff --git a/client/mysqlimport.c b/client/mysqlimport.c index f85a1c128e2..4ca6edf21f2 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -25,7 +25,7 @@ ** * * ** ************************* */ -#define IMPORT_VERSION "2.6" +#define IMPORT_VERSION "2.7" #include <global.h> #include <my_sys.h> diff --git a/client/mysqltest.c b/client/mysqltest.c index 18507879dfb..d65d451f408 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1098,10 +1098,7 @@ void str_to_file(const char* fname, char* str, int size) void reject_dump(const char* record_file, char* buf, int size) { char reject_file[FN_REFLEN]; - if (strlen(record_file) >= FN_REFLEN-8) - die("too long path name for reject"); - strmov(strmov(reject_file, record_file),".reject"); - str_to_file(reject_file, buf, size); + str_to_file(fn_format(reject_file, record_file,"",".reject",2), buf, size); } @@ -1282,9 +1279,6 @@ int main(int argc, char** argv) if (!( mysql_init(&cur_con->mysql))) die("Failed in mysql_init()"); - - mysql_options(&cur_con->mysql, MYSQL_READ_DEFAULT_GROUP, "mysql"); - cur_con->name = my_strdup("default", MYF(MY_WME)); if (!cur_con->name) die("Out of memory"); diff --git a/client/readline.cc b/client/readline.cc index c14059d98c8..f0312b089e5 100644 --- a/client/readline.cc +++ b/client/readline.cc @@ -26,7 +26,7 @@ static bool init_line_buffer(LINE_BUFFER *buffer,File file,ulong size, ulong max_size); static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str); static uint fill_buffer(LINE_BUFFER *buffer); -static char *intern_read_line(LINE_BUFFER *buffer,uint *out_length); +static char *intern_read_line(LINE_BUFFER *buffer,ulong *out_length); LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file) @@ -46,12 +46,13 @@ LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file) char *batch_readline(LINE_BUFFER *line_buff) { char *pos; - uint out_length; + ulong out_length; if (!(pos=intern_read_line(line_buff,&out_length))) return 0; if (out_length && pos[out_length-1] == '\n') out_length--; /* Remove '\n' */ + line_buff->read_length=out_length; pos[out_length]=0; return pos; } @@ -187,7 +188,7 @@ static uint fill_buffer(LINE_BUFFER *buffer) -char *intern_read_line(LINE_BUFFER *buffer,uint *out_length) +char *intern_read_line(LINE_BUFFER *buffer,ulong *out_length) { char *pos; uint length; @@ -210,7 +211,7 @@ char *intern_read_line(LINE_BUFFER *buffer,uint *out_length) pos--; /* break line here */ } buffer->end_of_line=pos+1; - *out_length=(uint) (pos + 1 - buffer->eof - buffer->start_of_line); + *out_length=(ulong) (pos + 1 - buffer->eof - buffer->start_of_line); DBUG_RETURN(buffer->start_of_line); } } |