database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

After merge fixes

Browse Source 
mysql-test/r/query_cache.result:
  Updated test for 4.1
mysql-test/t/query_cache.test:
  Updated test for 4.1
sql/sql_parse.cc:
  After merge fix
sql/sql_yacc.yy:
  After merge fix
This commit is contained in:
unknown
2003-03-27 14:15:42 +02:00
parent 9630bdffdd
commit 3ce463ec16
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/query_cache.result
View File

@@ -566,7 +566,6 @@ show status like "Qcache_queries_in_cache";
Variable_name Value Variable_name Value
Qcache_queries_in_cache 0 Qcache_queries_in_cache 0
drop table t1; drop table t1;
drop table if exists t1;
create table t1 (a int); create table t1 (a int);
insert into t1 values (1),(2),(3); insert into t1 values (1),(2),(3);
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";

1
mysql-test/t/query_cache.test
View File

@@ -416,7 +416,6 @@ drop table t1;
# INTO OUTFILE/DUMPFILE test # INTO OUTFILE/DUMPFILE test
# #
drop table if exists t1;
create table t1 (a int); create table t1 (a int);
insert into t1 values (1),(2),(3); insert into t1 values (1),(2),(3);
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";

2
sql/sql_parse.cc
View File

@@ -3433,7 +3433,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
} }
else if (type_modifier & AUTO_INCREMENT_FLAG) else if (type_modifier & AUTO_INCREMENT_FLAG)
{ {
net_printf(&thd, ER_INVALID_DEFAULT, field_name); net_printf(thd, ER_INVALID_DEFAULT, field_name);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
} }

4
sql/sql_yacc.yy
View File

@@ -3081,7 +3081,7 @@ into:
LEX *lex=Lex; LEX *lex=Lex;
if (!lex->describe) if (!lex->describe)
{ {
lex->uncacheable() lex->uncacheable();
if (!(lex->exchange= new sql_exchange($3.str,0))) if (!(lex->exchange= new sql_exchange($3.str,0)))
YYABORT; YYABORT;
if (!(lex->result= new select_export(lex->exchange))) if (!(lex->result= new select_export(lex->exchange)))
@@ -3094,7 +3094,7 @@ into:
LEX *lex=Lex; LEX *lex=Lex;
if (!lex->describe) if (!lex->describe)
{ {
lex->uncacheable() lex->uncacheable();
if (!(lex->exchange= new sql_exchange($3.str,1))) if (!(lex->exchange= new sql_exchange($3.str,1)))
YYABORT; YYABORT;
if (!(lex->result= new select_dump(lex->exchange))) if (!(lex->result= new select_dump(lex->exchange)))