1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mysqltest bugfix

Browse Source 
typo/bad merge fixed
chmod a-x for man/*.1 files
This commit is contained in:
serg@serg.mysql.com 2001-04-15 20:14:40 +02:00
parent 6a41e1f3a5
commit 5d86c27a2d
13 changed files with 76 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
client/mysqltest.c
View File

@ -1522,13 +1522,16 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
if(!(flags & QUERY_REAP))
return 0;
if (mysql_read_query_result(mysql))
if (mysql_read_query_result(mysql) ||
(!(res = mysql_store_result(mysql)) && mysql_field_count(mysql)))
{
if (q->require_file)
abort_not_supported_test();
if (q->abort_on_error)
die("At line %u: query '%s' failed: %d: %s", start_lineno, query,
mysql_errno(mysql), mysql_error(mysql));
/*die("At line %u: Failed in mysql_store_result for query '%s' (%d)",
start_lineno, query, mysql_errno(mysql));*/
else
{
for (i=0 ; q->expected_errno[i] ; i++)
@ -1549,6 +1552,12 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
*/
goto end;
}
/*{
verbose_msg("failed in mysql_store_result for query '%s' (%d)", query,
mysql_errno(mysql));
error = 1;
goto end;
}*/
}
if (q->expected_errno[0])
@ -1559,23 +1568,6 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
goto end;
}
if (!(res = mysql_store_result(mysql)) && mysql_field_count(mysql))
{
if (q->require_file)
abort_not_supported_test();
if (q->abort_on_error)
die("At line %u: Failed in mysql_store_result for query '%s' (%d)",
start_lineno, query, mysql_errno(mysql));
else
{
verbose_msg("failed in mysql_store_result for query '%s' (%d)", query,
mysql_errno(mysql));
error = 1;
goto end;
}
}
if (!res) goto end;
fields = mysql_fetch_fields(res);

0
man/isamchk.1 Executable file → Normal file
View File

0
man/mysqlaccess.1 Executable file → Normal file
View File

0
man/mysqladmin.1 Executable file → Normal file
View File

0
man/mysqld.1 Executable file → Normal file
View File

0
man/mysqldump.1 Executable file → Normal file
View File

0
man/mysqlshow.1 Executable file → Normal file
View File

0
man/perror.1 Executable file → Normal file
View File

0
man/safe_mysqld.1 Executable file → Normal file
View File

61
mysql-test/r/handler.result
View File

@ -24,3 +24,64 @@ a b
a b
a b
15 bbb
a b
16 ccc
a b
19 fff
a b
19 yyy
a b
19 fff
a b
a b
14 aaa
a b
18 eee
a b
18 eee
a b
19 fff
a b
18 eee
a b
17 ddd
a b
14 aaa
15 bbb
16 ccc
16 xxx
17 ddd
a b
18 eee
19 fff
19 yyy
a b
19 fff
18 eee
17 ddd
16 xxx
16 ccc
15 bbb
14 aaa
a b
16 ccc
16 xxx
17 ddd
18 eee
a b
17 ddd
18 eee
a b
22 iii
21 hhh
20 ggg
a b
19 fff
a b
19 yyy
a b
17 ddd
a b
18 eee
a b
19 fff

2
mysql-test/t/handler.test
View File

@ -59,7 +59,7 @@ handler t2 read a=(19) where b="yyy";
handler t2 read first;
handler t2 read next;
handler t2 read next;
handler t2 read last;
!$1064 handler t2 read last;
handler t2 close;
drop table if exists t1;

2
sql/Makefile.am
View File

@ -41,7 +41,7 @@ LDADD = ../isam/libnisam.a \
../regex/libregex.a \
../strings/libmystrings.a
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
@bdb_libs@ @innobase_libs@ @pstack_libs@ \
@bdb_libs@ @innodb_libs@ @pstack_libs@ \
@gemini_libs@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS)
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \

7
sql/sql_yacc.yy
View File

@ -444,7 +444,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
%token TINYINT
%token TINYTEXT
%token UNSIGNED
>>>>>>> BitKeeper/tmp/sql_yacc.yy_serg@1.85
%token VARBINARY
%token VARCHAR
%token VARIABLES
@ -2185,7 +2184,7 @@ values:
/* Update rows in a table */
update:
UPDATE_SYM opt_low_priority opt_ignore table
UPDATE_SYM opt_low_priority opt_ignore table_name
SET update_list
where_clause
opt_order_clause
@ -2224,7 +2223,7 @@ delete:
Lex->order_list.first=0;
Lex->order_list.next= (byte**) &Lex->order_list.first;
}
opt_delete_options FROM table
opt_delete_options FROM table_name
where_clause opt_order_clause delete_limit_clause
@ -2237,7 +2236,7 @@ opt_delete_option:
| LOW_PRIORITY { Lex->lock_option= TL_WRITE_LOW_PRIORITY; }
truncate:
TRUNCATE_SYM opt_table_sym table
TRUNCATE_SYM opt_table_sym table_name
{
LEX* lex = Lex;
lex->sql_command= SQLCOM_TRUNCATE;