Commit 5d86c27a authored by serg@serg.mysql.com's avatar serg@serg.mysql.com

mysqltest bugfix

typo/bad merge fixed
chmod a-x for man/*.1 files
parent 6a41e1f3
...@@ -1522,13 +1522,16 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) ...@@ -1522,13 +1522,16 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
if(!(flags & QUERY_REAP)) if(!(flags & QUERY_REAP))
return 0; 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) if (q->require_file)
abort_not_supported_test(); abort_not_supported_test();
if (q->abort_on_error) if (q->abort_on_error)
die("At line %u: query '%s' failed: %d: %s", start_lineno, query, die("At line %u: query '%s' failed: %d: %s", start_lineno, query,
mysql_errno(mysql), mysql_error(mysql)); 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 else
{ {
for (i=0 ; q->expected_errno[i] ; i++) for (i=0 ; q->expected_errno[i] ; i++)
...@@ -1549,6 +1552,12 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) ...@@ -1549,6 +1552,12 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
*/ */
goto end; 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]) if (q->expected_errno[0])
...@@ -1559,23 +1568,6 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) ...@@ -1559,23 +1568,6 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
goto end; 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; if (!res) goto end;
fields = mysql_fetch_fields(res); fields = mysql_fetch_fields(res);
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
...@@ -24,3 +24,64 @@ a b ...@@ -24,3 +24,64 @@ a b
a b a b
a b a b
15 bbb 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
...@@ -59,7 +59,7 @@ handler t2 read a=(19) where b="yyy"; ...@@ -59,7 +59,7 @@ handler t2 read a=(19) where b="yyy";
handler t2 read first; handler t2 read first;
handler t2 read next; handler t2 read next;
handler t2 read next; handler t2 read next;
handler t2 read last; !$1064 handler t2 read last;
handler t2 close; handler t2 close;
drop table if exists t1; drop table if exists t1;
...@@ -41,7 +41,7 @@ LDADD = ../isam/libnisam.a \ ...@@ -41,7 +41,7 @@ LDADD = ../isam/libnisam.a \
../regex/libregex.a \ ../regex/libregex.a \
../strings/libmystrings.a ../strings/libmystrings.a
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
@bdb_libs@ @innobase_libs@ @pstack_libs@ \ @bdb_libs@ @innodb_libs@ @pstack_libs@ \
@gemini_libs@ \ @gemini_libs@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS)
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
......
...@@ -444,7 +444,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); ...@@ -444,7 +444,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
%token TINYINT %token TINYINT
%token TINYTEXT %token TINYTEXT
%token UNSIGNED %token UNSIGNED
>>>>>>> BitKeeper/tmp/sql_yacc.yy_serg@1.85
%token VARBINARY %token VARBINARY
%token VARCHAR %token VARCHAR
%token VARIABLES %token VARIABLES
...@@ -2185,7 +2184,7 @@ values: ...@@ -2185,7 +2184,7 @@ values:
/* Update rows in a table */ /* Update rows in a table */
update: update:
UPDATE_SYM opt_low_priority opt_ignore table UPDATE_SYM opt_low_priority opt_ignore table_name
SET update_list SET update_list
where_clause where_clause
opt_order_clause opt_order_clause
...@@ -2224,7 +2223,7 @@ delete: ...@@ -2224,7 +2223,7 @@ delete:
Lex->order_list.first=0; Lex->order_list.first=0;
Lex->order_list.next= (byte**) &Lex->order_list.first; 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 where_clause opt_order_clause delete_limit_clause
...@@ -2237,7 +2236,7 @@ opt_delete_option: ...@@ -2237,7 +2236,7 @@ opt_delete_option:
| LOW_PRIORITY { Lex->lock_option= TL_WRITE_LOW_PRIORITY; } | LOW_PRIORITY { Lex->lock_option= TL_WRITE_LOW_PRIORITY; }
truncate: truncate:
TRUNCATE_SYM opt_table_sym table TRUNCATE_SYM opt_table_sym table_name
{ {
LEX* lex = Lex; LEX* lex = Lex;
lex->sql_command= SQLCOM_TRUNCATE; lex->sql_command= SQLCOM_TRUNCATE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment