From 5c68c9042a6b01107c151fb15c2ca29a427f8ea0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 28 Dec 2000 19:25:41 +0200 Subject: Cleanup of tests Fixed bug with ALTER TABLE on HEAP tables mysql-test/r/alter_table.result: Turn off SCCS flag mysql-test/r/analyse.result: Turn off SCCS flag mysql-test/r/auto_increment.result: Turn off SCCS flag mysql-test/r/bdb.result: Turn off SCCS flag mysql-test/r/bigint.result: Turn off SCCS flag mysql-test/r/binary.result: Turn off SCCS flag mysql-test/r/case.result: Turn off SCCS flag mysql-test/r/comments.result: Turn off SCCS flag mysql-test/r/compare.result: Turn off SCCS flag mysql-test/r/count_distinct.result: Turn off SCCS flag mysql-test/r/create.result: Turn off SCCS flag mysql-test/r/delayed.result: Turn off SCCS flag mysql-test/r/distinct.result: Turn off SCCS flag mysql-test/r/empty_table.result: Turn off SCCS flag mysql-test/r/explain.result: Turn off SCCS flag mysql-test/r/ft0000001.a.result: Turn off SCCS flag mysql-test/r/ft0000001.b.result: Turn off SCCS flag mysql-test/r/ft0000001.c.result: Turn off SCCS flag mysql-test/r/ft0000001.d.result: Turn off SCCS flag mysql-test/r/ft0000001.e.result: Turn off SCCS flag mysql-test/r/ft0000002.a.result: Turn off SCCS flag mysql-test/r/ft0000002.b.result: Turn off SCCS flag mysql-test/r/ft0000002.c.result: Turn off SCCS flag mysql-test/r/fulltext.result: Turn off SCCS flag mysql-test/r/func_crypt.result: Turn off SCCS flag mysql-test/r/func_date_add.result: Turn off SCCS flag mysql-test/r/func_equal.result: Turn off SCCS flag mysql-test/r/func_group.result: Turn off SCCS flag mysql-test/r/func_in.result: Turn off SCCS flag mysql-test/r/func_like.result: Turn off SCCS flag mysql-test/r/func_math.result: Turn off SCCS flag mysql-test/r/func_misc.result: Turn off SCCS flag mysql-test/r/func_op.result: Turn off SCCS flag mysql-test/r/func_regexp.result: Turn off SCCS flag mysql-test/r/func_set.result: Turn off SCCS flag mysql-test/r/func_str.result: Turn off SCCS flag mysql-test/r/func_system.result: Turn off SCCS flag mysql-test/r/func_test.result: Turn off SCCS flag mysql-test/r/func_time.result: Turn off SCCS flag mysql-test/r/group_by.result: Turn off SCCS flag mysql-test/r/heap.result: Turn off SCCS flag mysql-test/r/ins000001.result: Turn off SCCS flag mysql-test/r/insert.result: Turn off SCCS flag mysql-test/r/insert_select.result: Turn off SCCS flag mysql-test/r/join.result: Turn off SCCS flag mysql-test/r/join_outer.result: Turn off SCCS flag mysql-test/r/key.result: Turn off SCCS flag mysql-test/r/key_diff.result: Turn off SCCS flag mysql-test/r/key_primary.result: Turn off SCCS flag mysql-test/r/keywords.result: Turn off SCCS flag mysql-test/r/limit.result: Turn off SCCS flag mysql-test/r/merge.result: Turn off SCCS flag mysql-test/r/null.result: Turn off SCCS flag mysql-test/r/null_key.result: Turn off SCCS flag mysql-test/r/odbc.result: Turn off SCCS flag mysql-test/r/order_by.result: Turn off SCCS flag mysql-test/r/raid.result: Turn off SCCS flag mysql-test/r/range.result: Turn off SCCS flag mysql-test/r/rename.result: Turn off SCCS flag mysql-test/r/replace.result: Turn off SCCS flag mysql-test/r/rollback.result: Turn off SCCS flag mysql-test/r/rpl000001.a.result: Turn off SCCS flag mysql-test/r/rpl000001.b.result: Turn off SCCS flag mysql-test/r/rpl000002.result: Turn off SCCS flag mysql-test/r/rpl000003.result: Turn off SCCS flag mysql-test/r/rpl000004.a.result: Turn off SCCS flag mysql-test/r/rpl000004.b.result: Turn off SCCS flag mysql-test/r/rpl000005.result: Turn off SCCS flag mysql-test/r/rpl000006.result: Turn off SCCS flag mysql-test/r/rpl000007.result: Turn off SCCS flag mysql-test/r/rpl000008.result: Turn off SCCS flag mysql-test/r/rpl000009.result: Turn off SCCS flag mysql-test/r/rpl000010.result: Turn off SCCS flag mysql-test/r/rpl000011.result: Turn off SCCS flag mysql-test/r/rpl000012.result: Turn off SCCS flag mysql-test/r/rpl000012.status.result: Turn off SCCS flag mysql-test/r/rpl000013.result: Turn off SCCS flag mysql-test/r/rpl000013.status.result: Turn off SCCS flag mysql-test/r/rpl000014.result: Turn off SCCS flag mysql-test/r/rpl000015.result: Turn off SCCS flag mysql-test/r/rpl000016.result: Turn off SCCS flag mysql-test/r/sel000001.result: Turn off SCCS flag mysql-test/r/sel000002.result: Turn off SCCS flag mysql-test/r/sel000003.result: Turn off SCCS flag mysql-test/r/sel000031.result: Turn off SCCS flag mysql-test/r/sel000032.result: Turn off SCCS flag mysql-test/r/sel000033.result: Turn off SCCS flag mysql-test/r/sel000100.result: Turn off SCCS flag mysql-test/r/select_safe.result: Turn off SCCS flag mysql-test/r/show_check.result: Turn off SCCS flag mysql-test/r/shw000001.result: Turn off SCCS flag mysql-test/r/slave-running.result: Turn off SCCS flag mysql-test/r/slave-stopped.result: Turn off SCCS flag mysql-test/r/tablelock.result: Turn off SCCS flag mysql-test/r/temp_table.result: Turn off SCCS flag mysql-test/r/truncate.result: Turn off SCCS flag mysql-test/r/type_blob.result: Turn off SCCS flag mysql-test/r/type_date.result: Turn off SCCS flag mysql-test/r/type_datetime.result: Turn off SCCS flag mysql-test/r/type_enum.result: Turn off SCCS flag mysql-test/r/type_float.result: Turn off SCCS flag mysql-test/r/type_ranges.result: Turn off SCCS flag mysql-test/r/type_time.result: Turn off SCCS flag mysql-test/r/type_timestamp.result: Turn off SCCS flag mysql-test/r/type_uint.result: Turn off SCCS flag mysql-test/r/type_year.result: Turn off SCCS flag mysql-test/r/update.result: Turn off SCCS flag mysql-test/r/varbinary.result: Turn off SCCS flag mysql-test/r/variables.result: Turn off SCCS flag Docs/manual.texi: Changelog client/my_readline.h: Added read length to readline() client/mysql.cc: cleanup client/mysqladmin.c: cleanup client/mysqldump.c: Added handling of hexadecimal constants client/mysqlimport.c: Version change client/mysqltest.c: Don't append the .reject extension, instead replace the old extension client/readline.cc: Added read length to readline() heap/hp_open.c: extra debug merge/rrnd.c: Fix bug in merge tables mysql-test/install_test_db.sh: Portability fixes mysql-test/mysql-test-run.sh: Portability fixes Added --ddd and --debug options scripts/mysqld_multi.sh: Add pathname to mysqladmin sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql/mysqld.cc: Some fixes for gemini sql/sql_table.cc: Fixed bug with ALTER TABLE on HEAP tables --- client/my_readline.h | 1 + client/mysql.cc | 1 - client/mysqladmin.c | 1 - client/mysqldump.c | 13 +++++++++---- client/mysqlimport.c | 2 +- client/mysqltest.c | 5 +---- client/readline.cc | 9 +++++---- 7 files changed, 17 insertions(+), 15 deletions(-) (limited to 'client') 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..e3cc17e23cd 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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--) 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 **/ -#define DUMP_VERSION "8.11" +#define DUMP_VERSION "8.12" #include #include @@ -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 #include diff --git a/client/mysqltest.c b/client/mysqltest.c index 0c1efae62d6..5896c655d22 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1096,10 +1096,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); } 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); } } -- cgit v1.2.1