Skip to content

M
MariaDB
Commit 282855e9 authored by unknown's avatar unknown
Browse files
Options

Merge bk-internal:/home/bk/mysql-5.1 

into  mysql.com:/home/jimw/my/mysql-5.1-clean
parents 7382cc71 3324dd82
Show whitespace changes
Inline Side-by-side
Showing with 425 additions and 215 deletions
client/mysqltest.c
View file @ 282855e9
...@@ -3056,12 +3056,6 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) ...@@ -3056,12 +3056,6 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
goto end; goto end;
} }
if (handle_no_error(q))
{
error= 1;
goto end;
}
if (!disable_result_log) if (!disable_result_log)
{ {
ulong affected_rows; /* Ok to be undef if 'disable_info' is set */ ulong affected_rows; /* Ok to be undef if 'disable_info' is set */
...@@ -3106,12 +3100,9 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) ...@@ -3106,12 +3100,9 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
MYSQL_RES *warn_res=0; MYSQL_RES *warn_res=0;
uint count= mysql_warning_count(mysql); uint count= mysql_warning_count(mysql);
if (!mysql_real_query(mysql, "SHOW WARNINGS", 13)) if (!mysql_real_query(mysql, "SHOW WARNINGS", 13))
{
warn_res= mysql_store_result(mysql); warn_res= mysql_store_result(mysql);
}
if (!warn_res) if (!warn_res)
verbose_msg("Warning count is %u but didn't get any warnings", die("Warning count is %u but didn't get any warnings", count);
count);
else else
{ {
dynstr_append_mem(ds, "Warnings:\n", 10); dynstr_append_mem(ds, "Warnings:\n", 10);
...@@ -3142,15 +3133,28 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) ...@@ -3142,15 +3133,28 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
} }
else if (q->record_file[0]) else if (q->record_file[0])
{ {
error = check_result(ds, q->record_file, q->require_file); error= check_result(ds, q->record_file, q->require_file);
} }
if (res) if (res)
mysql_free_result(res); mysql_free_result(res);
last_result= 0; last_result= 0;
counter++; counter++;
} while (!(err= mysql_next_result(mysql))); } while (!(err= mysql_next_result(mysql)));
if (err >= 1) if (err > 0)
mysql_error(mysql); {
/* We got an error from mysql_next_result, maybe expected */
if (handle_error(query, q, mysql_errno(mysql), mysql_error(mysql),
mysql_sqlstate(mysql), ds))
error= 1;
goto end;
}
// If we come here the query is both executed and read successfully
if (handle_no_error(q))
{
error= 1;
goto end;
}
end: end:
free_replace(); free_replace();
...@@ -3203,8 +3207,7 @@ static int handle_error(const char *query, struct st_query *q, ...@@ -3203,8 +3207,7 @@ static int handle_error(const char *query, struct st_query *q,
abort_not_supported_test(); abort_not_supported_test();
if (q->abort_on_error) if (q->abort_on_error)
die("query '%s' failed: %d: %s", query, die("query '%s' failed: %d: %s", query, err_errno, err_error);
err_errno, err_error);
for (i= 0 ; (uint) i < q->expected_errors ; i++) for (i= 0 ; (uint) i < q->expected_errors ; i++)
{ {
...@@ -3243,13 +3246,11 @@ static int handle_error(const char *query, struct st_query *q, ...@@ -3243,13 +3246,11 @@ static int handle_error(const char *query, struct st_query *q,
if (i) if (i)
{ {
if (q->expected_errno[0].type == ERR_ERRNO) if (q->expected_errno[0].type == ERR_ERRNO)
verbose_msg("query '%s' failed with wrong errno %d instead of %d...", die("query '%s' failed with wrong errno %d instead of %d...",
q->query, err_errno, q->query, err_errno, q->expected_errno[0].code.errnum);
q->expected_errno[0].code.errnum);
else else
verbose_msg("query '%s' failed with wrong sqlstate %s instead of %s...", die("query '%s' failed with wrong sqlstate %s instead of %s...",
q->query, err_sqlstate, q->query, err_sqlstate, q->expected_errno[0].code.sqlstate);
q->expected_errno[0].code.sqlstate);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
...@@ -3283,7 +3284,7 @@ static int handle_no_error(struct st_query *q) ...@@ -3283,7 +3284,7 @@ static int handle_no_error(struct st_query *q)
q->expected_errno[0].code.errnum != 0) q->expected_errno[0].code.errnum != 0)
{ {
/* Error code we wanted was != 0, i.e. not an expected success */ /* Error code we wanted was != 0, i.e. not an expected success */
verbose_msg("query '%s' succeeded - should have failed with errno %d...", die("query '%s' succeeded - should have failed with errno %d...",
q->query, q->expected_errno[0].code.errnum); q->query, q->expected_errno[0].code.errnum);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
...@@ -3291,7 +3292,7 @@ static int handle_no_error(struct st_query *q) ...@@ -3291,7 +3292,7 @@ static int handle_no_error(struct st_query *q)
strcmp(q->expected_errno[0].code.sqlstate,"00000") != 0) strcmp(q->expected_errno[0].code.sqlstate,"00000") != 0)
{ {
/* SQLSTATE we wanted was != "00000", i.e. not an expected success */ /* SQLSTATE we wanted was != "00000", i.e. not an expected success */
verbose_msg("query '%s' succeeded - should have failed with sqlstate %s...", die("query '%s' succeeded - should have failed with sqlstate %s...",
q->query, q->expected_errno[0].code.sqlstate); q->query, q->expected_errno[0].code.sqlstate);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
...@@ -3312,7 +3313,7 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) ...@@ -3312,7 +3313,7 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
{ {
int error= 0; /* Function return code if "goto end;" */ int error= 0; /* Function return code if "goto end;" */
int err; /* Temporary storage of return code from calls */ int err; /* Temporary storage of return code from calls */
int query_len, got_error_on_execute; int query_len;
ulonglong num_rows; ulonglong num_rows;
char *query; char *query;
MYSQL_RES *res= NULL; /* Note that here 'res' is meta data result set */ MYSQL_RES *res= NULL; /* Note that here 'res' is meta data result set */
...@@ -3368,26 +3369,17 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) ...@@ -3368,26 +3369,17 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
return run_query_normal(mysql, q, flags); return run_query_normal(mysql, q, flags);
if (err != 0) if (err != 0)
{
if (q->abort_on_error)
{
die("query '%s' failed: %d: %s", query,
mysql_stmt_errno(stmt), mysql_stmt_error(stmt));
}
else
{ {
/* /*
Preparing is part of normal execution and some errors may be expected Preparing is part of normal execution and some errors may be expected
*/ */
error= handle_error(query, q, mysql_stmt_errno(stmt), if (handle_error(query, q, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), ds))
ds); error= 1;
goto end; goto end;
} }
}
/* We may have got warnings already, collect them if any */ /* We may have got warnings already, collect them if any */
/* FIXME we only want this if the statement succeeds I think */
if (!disable_ps_warnings) if (!disable_ps_warnings)
run_query_stmt_handle_warnings(mysql, ds); run_query_stmt_handle_warnings(mysql, ds);
...@@ -3401,25 +3393,14 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) ...@@ -3401,25 +3393,14 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
prepared statement. prepared statement.
*/ */
if ((got_error_on_execute= mysql_stmt_execute(stmt)) != 0) /* 0 == Success */ if (mysql_stmt_execute(stmt) != 0) /* 0 == Success */
{
if (q->abort_on_error)
{
/* We got an error, unexpected */
die("unable to execute statement '%s': "
"%s (mysql_stmt_errno=%d returned=%d)",
query, mysql_stmt_error(stmt),
mysql_stmt_errno(stmt), got_error_on_execute);
}
else
{ {
/* We got an error, maybe expected */ /* We got an error, maybe expected */
error= handle_error(query, q, mysql_stmt_errno(stmt), if (handle_error(query, q, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), ds))
ds); error= 1;
goto end; goto end;
} }
}
/* /*
We instruct that we want to update the "max_length" field in We instruct that we want to update the "max_length" field in
...@@ -3428,11 +3409,10 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) ...@@ -3428,11 +3409,10 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
*/ */
{ {
my_bool one= 1; my_bool one= 1;
if (mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, if ((err= mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH,
(void*) &one) != 0) (void*) &one)) != 0)
die("unable to set stmt attribute " die("unable to set stmt attribute "
"'STMT_ATTR_UPDATE_MAX_LENGTH': %s (returned=%d)", "'STMT_ATTR_UPDATE_MAX_LENGTH' err: %d", err);
query, err);
} }
/* /*
...@@ -3440,24 +3420,13 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) ...@@ -3440,24 +3420,13 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
get data. Note that this can still give errors found during execution! get data. Note that this can still give errors found during execution!
*/ */
if ((err= mysql_stmt_store_result(stmt)) != 0) if ((err= mysql_stmt_store_result(stmt)) != 0)
{
if (q->abort_on_error)
{
/* We got an error, unexpected */
die("unable to execute statement '%s': "
"%s (mysql_stmt_errno=%d returned=%d)",
query, mysql_stmt_error(stmt),
mysql_stmt_errno(stmt), got_error_on_execute);
}
else
{ {
/* We got an error, maybe expected */ /* We got an error, maybe expected */
error= handle_error(query, q, mysql_stmt_errno(stmt), if(handle_error(query, q, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), ds))
ds); error = 1;
goto end; goto end;
} }
}
/* If we got here the statement was both executed and read succeesfully */ /* If we got here the statement was both executed and read succeesfully */
if (handle_no_error(q)) if (handle_no_error(q))
...@@ -3480,8 +3449,6 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) ...@@ -3480,8 +3449,6 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
MYSQL_FIELD *field= mysql_fetch_fields(res); MYSQL_FIELD *field= mysql_fetch_fields(res);
uint num_fields= mysql_num_fields(res); uint num_fields= mysql_num_fields(res);
/* FIXME check error from the above? */
if (display_metadata) if (display_metadata)
run_query_display_metadata(field, num_fields, ds); run_query_display_metadata(field, num_fields, ds);
...@@ -3634,9 +3601,6 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) ...@@ -3634,9 +3601,6 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
mysql_free_result(res); /* Free normal result set with meta data */ mysql_free_result(res); /* Free normal result set with meta data */
last_result= 0; /* FIXME have no idea what this is about... */ last_result= 0; /* FIXME have no idea what this is about... */
if (err >= 1)
mysql_error(mysql); /* FIXME strange, has no effect... */
end: end:
free_replace(); free_replace();
last_result=0; last_result=0;
...@@ -3727,7 +3691,7 @@ static void run_query_stmt_handle_warnings(MYSQL *mysql, DYNAMIC_STRING *ds) ...@@ -3727,7 +3691,7 @@ static void run_query_stmt_handle_warnings(MYSQL *mysql, DYNAMIC_STRING *ds)
{ {
MYSQL_RES *warn_res= mysql_store_result(mysql); MYSQL_RES *warn_res= mysql_store_result(mysql);
if (!warn_res) if (!warn_res)
verbose_msg("Warning count is %u but didn't get any warnings", die("Warning count is %u but didn't get any warnings",
count); count);
else else
{ {
......
mysql-test/r/mysqltest.result
View file @ 282855e9
...@@ -134,7 +134,6 @@ select 1146 as "after_!errno_masked_error" ; ...@@ -134,7 +134,6 @@ select 1146 as "after_!errno_masked_error" ;
after_!errno_masked_error after_!errno_masked_error
1146 1146
mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1000... mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1000...
mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1000...
garbage ; garbage ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1
select 1064 as "after_--enable_abort_on_error" ; select 1064 as "after_--enable_abort_on_error" ;
...@@ -143,7 +142,6 @@ after_--enable_abort_on_error ...@@ -143,7 +142,6 @@ after_--enable_abort_on_error
select 3 from t1 ; select 3 from t1 ;
ERROR 42S02: Table 'test.t1' doesn't exist ERROR 42S02: Table 'test.t1' doesn't exist
mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1064... mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1064...
mysqltest: At line 1: query 'select 3 from t1' failed: 1146: Table 'test.t1' doesn't exist
hello hello
hello hello
;;;;;;;; ;;;;;;;;
......
mysql-test/r/query_cache.result
View file @ 282855e9
...@@ -1057,42 +1057,64 @@ create table t1 (s1 int)// ...@@ -1057,42 +1057,64 @@ create table t1 (s1 int)//
create procedure f1 () begin create procedure f1 () begin
select sql_cache * from t1; select sql_cache * from t1;
select sql_cache * from t1; select sql_cache * from t1;
select sql_cache * from t1;
end;//
create procedure f2 () begin
select sql_cache * from t1 where s1=1;
select sql_cache * from t1;
end;//
create procedure f3 () begin
select sql_cache * from t1;
select sql_cache * from t1 where s1=1;
end;//
create procedure f4 () begin
select sql_cache * from t1;
select sql_cache * from t1 where s1=1;
select sql_cache * from t1;
select sql_cache * from t1 where s1=1;
select sql_cache * from t1 where s1=1;
end;// end;//
call f1(); call f1();
s1 s1
s1
s1
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
Variable_name Value Variable_name Value
Qcache_queries_in_cache 1 Qcache_queries_in_cache 3
show status like "Qcache_inserts"; show status like "Qcache_inserts";
Variable_name Value Variable_name Value
Qcache_inserts 1 Qcache_inserts 3
show status like "Qcache_hits"; show status like "Qcache_hits";
Variable_name Value Variable_name Value
Qcache_hits 1 Qcache_hits 0
call f1(); call f1();
s1 s1
s1
s1
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
Variable_name Value Variable_name Value
Qcache_queries_in_cache 1 Qcache_queries_in_cache 3
show status like "Qcache_inserts"; show status like "Qcache_inserts";
Variable_name Value Variable_name Value
Qcache_inserts 1 Qcache_inserts 3
show status like "Qcache_hits"; show status like "Qcache_hits";
Variable_name Value Variable_name Value
Qcache_hits 3 Qcache_hits 3
call f1(); call f1();
s1 s1
s1
s1
select sql_cache * from t1; select sql_cache * from t1;
s1 s1
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
Variable_name Value Variable_name Value
Qcache_queries_in_cache 2 Qcache_queries_in_cache 4
show status like "Qcache_inserts"; show status like "Qcache_inserts";
Variable_name Value Variable_name Value
Qcache_inserts 2 Qcache_inserts 4
show status like "Qcache_hits"; show status like "Qcache_hits";
Variable_name Value Variable_name Value
Qcache_hits 5 Qcache_hits 6
insert into t1 values (1); insert into t1 values (1);
select sql_cache * from t1; select sql_cache * from t1;
s1 s1
...@@ -1102,28 +1124,150 @@ Variable_name Value ...@@ -1102,28 +1124,150 @@ Variable_name Value
Qcache_queries_in_cache 1 Qcache_queries_in_cache 1
show status like "Qcache_inserts"; show status like "Qcache_inserts";
Variable_name Value Variable_name Value
Qcache_inserts 3 Qcache_inserts 5
show status like "Qcache_hits"; show status like "Qcache_hits";
Variable_name Value Variable_name Value
Qcache_hits 5 Qcache_hits 6
call f1(); call f1();
s1 s1
1 1
s1
1
s1
1
call f1(); call f1();
s1 s1
1 1
s1
1
s1
1
select sql_cache * from t1; select sql_cache * from t1;
s1 s1
1 1
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
Variable_name Value Variable_name Value
Qcache_queries_in_cache 2 Qcache_queries_in_cache 4
show status like "Qcache_inserts"; show status like "Qcache_inserts";
Variable_name Value Variable_name Value
Qcache_inserts 4 Qcache_inserts 8
show status like "Qcache_hits"; show status like "Qcache_hits";
Variable_name Value Variable_name Value
Qcache_hits 9 Qcache_hits 10
flush query cache;
reset query cache;
flush status;
select sql_cache * from t1;
s1
1
select sql_cache * from t1 where s1=1;
s1
1
call f1();
s1
1
s1
1
s1
1
call f2();
s1
1
s1
1
call f3();
s1
1
s1
1
call f4();
s1
1
s1
1
s1
1
s1
1
s1
1
call f4();
s1
1
s1
1
s1
1
s1
1
s1
1
call f3();
s1
1
s1
1
call f2();
s1
1
s1
1
select sql_cache * from t1 where s1=1;
s1
1
insert into t1 values (2);
call f1();
s1
1
2
s1
1
2
s1
1
2
select sql_cache * from t1 where s1=1;
s1
1
select sql_cache * from t1;
s1
1
2
call f1();
s1
1
2
s1
1
2
s1
1
2
call f3();
s1
1
2
s1
1
call f3();
s1
1
2
s1
1
call f1();
s1
1
2
s1
1
2
s1
1
2
drop procedure f1; drop procedure f1;
drop procedure f2;
drop procedure f3;
drop procedure f4;
drop table t1; drop table t1;
set GLOBAL query_cache_size=0; set GLOBAL query_cache_size=0;
mysql-test/r/sp-error.result
View file @ 282855e9
...@@ -692,6 +692,7 @@ END P1| ...@@ -692,6 +692,7 @@ END P1|
call SP001(); call SP001();
TEMP_SUM TEMP_SUM
0 0
ERROR 24000: Cursor is not open
drop procedure SP001; drop procedure SP001;
drop table t1, t2; drop table t1, t2;
drop function if exists bug11394| drop function if exists bug11394|
......
mysql-test/t/query_cache.test
View file @ 282855e9
...@@ -776,6 +776,7 @@ delimiter ;// ...@@ -776,6 +776,7 @@ delimiter ;//
# #
# query in QC from normal execution and SP (BUG#6897) # query in QC from normal execution and SP (BUG#6897)
# improved to also test BUG#3583 and BUG#12990
# #
flush query cache; flush query cache;
reset query cache; reset query cache;
...@@ -785,6 +786,22 @@ create table t1 (s1 int)// ...@@ -785,6 +786,22 @@ create table t1 (s1 int)//
create procedure f1 () begin create procedure f1 () begin
select sql_cache * from t1; select sql_cache * from t1;
select sql_cache * from t1; select sql_cache * from t1;
select sql_cache * from t1;
end;//
create procedure f2 () begin
select sql_cache * from t1 where s1=1;
select sql_cache * from t1;
end;//
create procedure f3 () begin
select sql_cache * from t1;
select sql_cache * from t1 where s1=1;
end;//
create procedure f4 () begin
select sql_cache * from t1;
select sql_cache * from t1 where s1=1;
select sql_cache * from t1;
select sql_cache * from t1 where s1=1;
select sql_cache * from t1 where s1=1;
end;// end;//
delimiter ;// delimiter ;//
call f1(); call f1();
...@@ -811,7 +828,32 @@ select sql_cache * from t1; ...@@ -811,7 +828,32 @@ select sql_cache * from t1;
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
show status like "Qcache_inserts"; show status like "Qcache_inserts";
show status like "Qcache_hits"; show status like "Qcache_hits";
flush query cache;
reset query cache;
flush status;
select sql_cache * from t1;
select sql_cache * from t1 where s1=1;
call f1();
call f2();
call f3();
call f4();
call f4();
call f3();
call f2();
select sql_cache * from t1 where s1=1;
insert into t1 values (2);
call f1();
select sql_cache * from t1 where s1=1;
select sql_cache * from t1;
call f1();
call f3();
call f3();
call f1();
drop procedure f1; drop procedure f1;
drop procedure f2;
drop procedure f3;
drop procedure f4;
drop table t1; drop table t1;
set GLOBAL query_cache_size=0; set GLOBAL query_cache_size=0;
......
mysql-test/t/sp-error.test
View file @ 282855e9
...@@ -991,6 +991,7 @@ P1: BEGIN ...@@ -991,6 +991,7 @@ P1: BEGIN
SELECT 'end of proc'; SELECT 'end of proc';
END P1| END P1|
delimiter ;| delimiter ;|
--error 1326
call SP001(); call SP001();
drop procedure SP001; drop procedure SP001;
drop table t1, t2; drop table t1, t2;
...@@ -1187,7 +1188,30 @@ delimiter ;| ...@@ -1187,7 +1188,30 @@ delimiter ;|
create trigger bug12712 create trigger bug12712
before insert on t1 for each row set session autocommit = 0; before insert on t1 for each row set session autocommit = 0;
#
# BUG#9367: Stored procedures: client hang after "show warnings"
#
--disable_parsing
--disable_warnings
drop procedure if exists bug9367;
--enable_warnings
create table t1 (s1 int);
select s1 from t1;
delimiter |;
create procedure bug9367()
begin
declare v int;
declare c cursor for select s1 from t1;
open c;
show warnings;
fetch c into v;
select v;
end|
delimiter ;|
call bug9367();
drop procedure bug9367;
drop table t1;
--enable_parsing
# #
# BUG#NNNN: New bug synopsis # BUG#NNNN: New bug synopsis
# #
......
sql/examples/ha_tina.cc
View file @ 282855e9
...@@ -17,13 +17,17 @@ ...@@ -17,13 +17,17 @@
/* /*
Make sure to look at ha_tina.h for more details. Make sure to look at ha_tina.h for more details.
First off, this is a play thing for me, there are a number of things wrong with it: First off, this is a play thing for me, there are a number of things
*) It was designed for csv and therefor its performance is highly questionable. wrong with it:
*) Indexes have not been implemented. This is because the files can be traded in *) It was designed for csv and therefore its performance is highly
and out of the table directory without having to worry about rebuilding anything. questionable.
*) Indexes have not been implemented. This is because the files can
be traded in and out of the table directory without having to worry
about rebuilding anything.
*) NULLs and "" are treated equally (like a spreadsheet). *) NULLs and "" are treated equally (like a spreadsheet).
*) There was in the beginning no point to anyone seeing this other then me, so there *) There was in the beginning no point to anyone seeing this other
is a good chance that I haven't quite documented it well. then me, so there is a good chance that I haven't quite documented
it well.
*) Less design, more "make it work" *) Less design, more "make it work"
Now there are a few cool things with it: Now there are a few cool things with it:
...@@ -173,11 +177,12 @@ static TINA_SHARE *get_share(const char *table_name, TABLE *table) ...@@ -173,11 +177,12 @@ static TINA_SHARE *get_share(const char *table_name, TABLE *table)
return NULL; return NULL;
} }
share->use_count=0; share->use_count= 0;
share->table_name_length=length; share->table_name_length= length;
share->table_name=tmp_name; share->table_name= tmp_name;
strmov(share->table_name,table_name); strmov(share->table_name, table_name);
fn_format(data_file_name, table_name, "", ".CSV",MY_REPLACE_EXT|MY_UNPACK_FILENAME); fn_format(data_file_name, table_name, "", ".CSV",
MY_REPLACE_EXT|MY_UNPACK_FILENAME);
if (my_hash_insert(&tina_open_tables, (byte*) share)) if (my_hash_insert(&tina_open_tables, (byte*) share))
goto error; goto error;
thr_lock_init(&share->lock); thr_lock_init(&share->lock);
...@@ -186,11 +191,14 @@ static TINA_SHARE *get_share(const char *table_name, TABLE *table) ...@@ -186,11 +191,14 @@ static TINA_SHARE *get_share(const char *table_name, TABLE *table)
if ((share->data_file= my_open(data_file_name, O_RDWR, MYF(0))) == -1) if ((share->data_file= my_open(data_file_name, O_RDWR, MYF(0))) == -1)
goto error2; goto error2;
/* We only use share->data_file for writing, so we scan to the end to append */ /*
We only use share->data_file for writing, so we scan to
the end to append
*/
if (my_seek(share->data_file, 0, SEEK_END, MYF(0)) == MY_FILEPOS_ERROR) if (my_seek(share->data_file, 0, SEEK_END, MYF(0)) == MY_FILEPOS_ERROR)
goto error2; goto error2;
share->mapped_file= NULL; // We don't know the state since we just allocated it share->mapped_file= NULL; // We don't know the state as we just allocated it
if (get_mmap(share, 0) > 0) if (get_mmap(share, 0) > 0)
goto error3; goto error3;
} }
...@@ -256,7 +264,8 @@ ha_tina::ha_tina(TABLE *table_arg) ...@@ -256,7 +264,8 @@ ha_tina::ha_tina(TABLE *table_arg)
These definitions are found in hanler.h These definitions are found in hanler.h
These are not probably completely right. These are not probably completely right.
*/ */
current_position(0), next_position(0), chain_alloced(0), chain_size(DEFAULT_CHAIN_LENGTH) current_position(0), next_position(0), chain_alloced(0),
chain_size(DEFAULT_CHAIN_LENGTH)
{ {
/* Set our original buffers from pre-allocated memory */ /* Set our original buffers from pre-allocated memory */
buffer.set(byte_buffer, IO_SIZE, system_charset_info); buffer.set(byte_buffer, IO_SIZE, system_charset_info);
...@@ -324,7 +333,9 @@ int ha_tina::encode_quote(byte *buf) ...@@ -324,7 +333,9 @@ int ha_tina::encode_quote(byte *buf)
} }
/* /*
chain_append() adds delete positions to the chain that we use to keep track of space. chain_append() adds delete positions to the chain that we use to keep
track of space. Then the chain will be used to cleanup "holes", occured
due to deletes and updates.
*/ */
int ha_tina::chain_append() int ha_tina::chain_append()
{ {
...@@ -340,12 +351,14 @@ int ha_tina::chain_append() ...@@ -340,12 +351,14 @@ int ha_tina::chain_append()
if (chain_alloced) if (chain_alloced)
{ {
/* Must cast since my_malloc unlike malloc doesn't have a void ptr */ /* Must cast since my_malloc unlike malloc doesn't have a void ptr */
if ((chain= (tina_set *)my_realloc((gptr)chain,chain_size,MYF(MY_WME))) == NULL) if ((chain= (tina_set *) my_realloc((gptr)chain,
chain_size, MYF(MY_WME))) == NULL)
return -1; return -1;
} }
else else
{ {
tina_set *ptr= (tina_set *)my_malloc(chain_size * sizeof(tina_set),MYF(MY_WME)); tina_set *ptr= (tina_set *) my_malloc(chain_size * sizeof(tina_set),
MYF(MY_WME));
memcpy(ptr, chain, DEFAULT_CHAIN_LENGTH * sizeof(tina_set)); memcpy(ptr, chain, DEFAULT_CHAIN_LENGTH * sizeof(tina_set));
chain= ptr; chain= ptr;
chain_alloced++; chain_alloced++;
...@@ -371,7 +384,8 @@ int ha_tina::find_current_row(byte *buf) ...@@ -371,7 +384,8 @@ int ha_tina::find_current_row(byte *buf)
DBUG_ENTER("ha_tina::find_current_row"); DBUG_ENTER("ha_tina::find_current_row");
/* EOF should be counted as new line */ /* EOF should be counted as new line */
if ((end_ptr= find_eoln(share->mapped_file, current_position, share->file_stat.st_size)) == 0) if ((end_ptr= find_eoln(share->mapped_file, current_position,
share->file_stat.st_size)) == 0)
DBUG_RETURN(HA_ERR_END_OF_FILE); DBUG_RETURN(HA_ERR_END_OF_FILE);
for (Field **field=table->field ; *field ; field++) for (Field **field=table->field ; *field ; field++)
...@@ -380,9 +394,10 @@ int ha_tina::find_current_row(byte *buf) ...@@ -380,9 +394,10 @@ int ha_tina::find_current_row(byte *buf)
mapped_ptr++; // Increment past the first quote mapped_ptr++; // Increment past the first quote
for(;mapped_ptr != end_ptr; mapped_ptr++) for(;mapped_ptr != end_ptr; mapped_ptr++)
{ {
//Need to convert line feeds! // Need to convert line feeds!
if (*mapped_ptr == '"' && if (*mapped_ptr == '"' &&
(((mapped_ptr[1] == ',') && (mapped_ptr[2] == '"')) || (mapped_ptr == end_ptr -1 ))) (((mapped_ptr[1] == ',') && (mapped_ptr[2] == '"')) ||
(mapped_ptr == end_ptr -1 )))
{ {
mapped_ptr += 2; // Move past the , and the " mapped_ptr += 2; // Move past the , and the "
break; break;
...@@ -521,17 +536,19 @@ int ha_tina::update_row(const byte * old_data, byte * new_data) ...@@ -521,17 +536,19 @@ int ha_tina::update_row(const byte * old_data, byte * new_data)
/* /*
Deletes a row. First the database will find the row, and then call this method. Deletes a row. First the database will find the row, and then call this
In the case of a table scan, the previous call to this will be the ::rnd_next() method. In the case of a table scan, the previous call to this will be
that found this row. the ::rnd_next() that found this row.
The exception to this is an ORDER BY. This will cause the table handler to walk The exception to this is an ORDER BY. This will cause the table handler
the table noting the positions of all rows that match a query. The table will to walk the table noting the positions of all rows that match a query.
then be deleted/positioned based on the ORDER (so RANDOM, DESC, ASC). The table will then be deleted/positioned based on the ORDER (so RANDOM,
DESC, ASC).
*/ */
int ha_tina::delete_row(const byte * buf) int ha_tina::delete_row(const byte * buf)
{ {
DBUG_ENTER("ha_tina::delete_row"); DBUG_ENTER("ha_tina::delete_row");
statistic_increment(table->in_use->status_var.ha_delete_count,&LOCK_status); statistic_increment(table->in_use->status_var.ha_delete_count,
&LOCK_status);
if (chain_append()) if (chain_append())
DBUG_RETURN(-1); DBUG_RETURN(-1);
...@@ -653,22 +670,26 @@ int ha_tina::rnd_init(bool scan) ...@@ -653,22 +670,26 @@ int ha_tina::rnd_init(bool scan)
chain_ptr= chain; chain_ptr= chain;
#ifdef HAVE_MADVISE #ifdef HAVE_MADVISE
if (scan) if (scan)
(void)madvise(share->mapped_file,share->file_stat.st_size,MADV_SEQUENTIAL); (void) madvise(share->mapped_file, share->file_stat.st_size,
MADV_SEQUENTIAL);
#endif #endif
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/* /*
::rnd_next() does all the heavy lifting for a table scan. You will need to populate *buf ::rnd_next() does all the heavy lifting for a table scan. You will need to
with the correct field data. You can walk the field to determine at what position you populate *buf with the correct field data. You can walk the field to
should store the data (take a look at how ::find_current_row() works). The structure determine at what position you should store the data (take a look at how
is something like: ::find_current_row() works). The structure is something like:
0Foo Dog Friend 0Foo Dog Friend
The first offset is for the first attribute. All space before that is reserved for null count. The first offset is for the first attribute. All space before that is
Basically this works as a mask for which rows are nulled (compared to just empty). reserved for null count.
This table handler doesn't do nulls and does not know the difference between NULL and "". This Basically this works as a mask for which rows are nulled (compared to just
is ok since this table handler is for spreadsheets and they don't know about them either :) empty).
This table handler doesn't do nulls and does not know the difference between
NULL and "". This is ok since this table handler is for spreadsheets and
they don't know about them either :)
*/ */
int ha_tina::rnd_next(byte *buf) int ha_tina::rnd_next(byte *buf)
{ {
...@@ -755,8 +776,10 @@ int ha_tina::reset(void) ...@@ -755,8 +776,10 @@ int ha_tina::reset(void)
/* /*
Called after deletes, inserts, and updates. This is where we clean up all of Called after each table scan. In particular after deletes,
the dead space we have collected while writing the file. and updates. In the last case we employ chain of deleted
slots to clean up all of the dead space we have collected while
performing deletes/updates.
*/ */
int ha_tina::rnd_end() int ha_tina::rnd_end()
{ {
...@@ -781,7 +804,8 @@ int ha_tina::rnd_end() ...@@ -781,7 +804,8 @@ int ha_tina::rnd_end()
It also sorts so that we move the final blocks to the It also sorts so that we move the final blocks to the
beginning so that we move the smallest amount of data possible. beginning so that we move the smallest amount of data possible.
*/ */
qsort(chain, (size_t)(chain_ptr - chain), sizeof(tina_set), (qsort_cmp)sort_set); qsort(chain, (size_t)(chain_ptr - chain), sizeof(tina_set),
(qsort_cmp)sort_set);
for (ptr= chain; ptr < chain_ptr; ptr++) for (ptr= chain; ptr < chain_ptr; ptr++)
{ {
/* We peek a head to see if this is the last chain */ /* We peek a head to see if this is the last chain */
...@@ -789,7 +813,8 @@ int ha_tina::rnd_end() ...@@ -789,7 +813,8 @@ int ha_tina::rnd_end()
memmove(share->mapped_file + ptr->begin, share->mapped_file + ptr->end, memmove(share->mapped_file + ptr->begin, share->mapped_file + ptr->end,
length - (size_t)ptr->end); length - (size_t)ptr->end);
else else
memmove((caddr_t)share->mapped_file + ptr->begin, (caddr_t)share->mapped_file + ptr->end, memmove((caddr_t)share->mapped_file + ptr->begin,
(caddr_t)share->mapped_file + ptr->end,
(size_t)((ptr++)->begin - ptr->end)); (size_t)((ptr++)->begin - ptr->end));
length= length - (size_t)(ptr->end - ptr->begin); length= length - (size_t)(ptr->end - ptr->begin);
} }
...@@ -852,11 +877,8 @@ THR_LOCK_DATA **ha_tina::store_lock(THD *thd, ...@@ -852,11 +877,8 @@ THR_LOCK_DATA **ha_tina::store_lock(THD *thd,
Range optimizer calls this. Range optimizer calls this.
I need to update the information on this. I need to update the information on this.
*/ */
ha_rows ha_tina::records_in_range(int inx, ha_rows ha_tina::records_in_range(uint inx, key_range *min_key,
const byte *start_key,uint start_key_len, key_range *max_key)
enum ha_rkey_function start_search_flag,
const byte *end_key,uint end_key_len,
enum ha_rkey_function end_search_flag)
{ {
DBUG_ENTER("ha_tina::records_in_range "); DBUG_ENTER("ha_tina::records_in_range ");
DBUG_RETURN(records); // Good guess DBUG_RETURN(records); // Good guess
...@@ -868,13 +890,15 @@ ha_rows ha_tina::records_in_range(int inx, ...@@ -868,13 +890,15 @@ ha_rows ha_tina::records_in_range(int inx,
this (the database will call ::open() if it needs to). this (the database will call ::open() if it needs to).
*/ */
int ha_tina::create(const char *name, TABLE *table_arg, HA_CREATE_INFO *create_info) int ha_tina::create(const char *name, TABLE *table_arg,
HA_CREATE_INFO *create_info)
{ {
char name_buff[FN_REFLEN]; char name_buff[FN_REFLEN];
File create_file; File create_file;
DBUG_ENTER("ha_tina::create"); DBUG_ENTER("ha_tina::create");
if ((create_file= my_create(fn_format(name_buff,name,"",".CSV",MY_REPLACE_EXT|MY_UNPACK_FILENAME),0, if ((create_file= my_create(fn_format(name_buff, name, "", ".CSV",
MY_REPLACE_EXT|MY_UNPACK_FILENAME),0,
O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)
DBUG_RETURN(-1); DBUG_RETURN(-1);
......
sql/examples/ha_tina.h
View file @ 282855e9
...@@ -43,6 +43,11 @@ class ha_tina: public handler ...@@ -43,6 +43,11 @@ class ha_tina: public handler
off_t next_position; /* Next position in the file scan */ off_t next_position; /* Next position in the file scan */
byte byte_buffer[IO_SIZE]; byte byte_buffer[IO_SIZE];
String buffer; String buffer;
/*
The chain contains "holes" in the file, occured because of
deletes/updates. It is used in rnd_end() to get rid of them
in the end of the query.
*/
tina_set chain_buffer[DEFAULT_CHAIN_LENGTH]; tina_set chain_buffer[DEFAULT_CHAIN_LENGTH];
tina_set *chain; tina_set *chain;
tina_set *chain_ptr; tina_set *chain_ptr;
...@@ -78,7 +83,11 @@ class ha_tina: public handler ...@@ -78,7 +83,11 @@ class ha_tina: public handler
*/ */
virtual double scan_time() { return (double) (records+deleted) / 20.0+10; } virtual double scan_time() { return (double) (records+deleted) / 20.0+10; }
/* The next method will never be called */ /* The next method will never be called */
virtual double read_time(ha_rows rows) { DBUG_ASSERT(0); return((double) rows / 20.0+1); } virtual double read_time(uint index, uint ranges, ha_rows rows)
{
DBUG_ASSERT(0);
return((double) rows / 20.0+1);
}
virtual bool fast_key_read() { return 1;} virtual bool fast_key_read() { return 1;}
/* /*
TODO: return actual upper bound of number of records in the table. TODO: return actual upper bound of number of records in the table.
...@@ -110,10 +119,8 @@ class ha_tina: public handler ...@@ -110,10 +119,8 @@ class ha_tina: public handler
int reset(void); int reset(void);
int external_lock(THD *thd, int lock_type); int external_lock(THD *thd, int lock_type);
int delete_all_rows(void); int delete_all_rows(void);
ha_rows records_in_range(int inx, const byte *start_key,uint start_key_len, ha_rows records_in_range(uint inx, key_range *min_key,
enum ha_rkey_function start_search_flag, key_range *max_key);
const byte *end_key,uint end_key_len,
enum ha_rkey_function end_search_flag);
// int delete_table(const char *from); // int delete_table(const char *from);
// int rename_table(const char * from, const char * to); // int rename_table(const char * from, const char * to);
int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info); int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info);
......
sql/mysql_priv.h
View file @ 282855e9
...@@ -544,6 +544,7 @@ struct Query_cache_query_flags ...@@ -544,6 +544,7 @@ struct Query_cache_query_flags
unsigned int client_long_flag:1; unsigned int client_long_flag:1;
unsigned int client_protocol_41:1; unsigned int client_protocol_41:1;
unsigned int more_results_exists:1; unsigned int more_results_exists:1;
unsigned int pkt_nr;
uint character_set_client_num; uint character_set_client_num;
uint character_set_results_num; uint character_set_results_num;
uint collation_connection_num; uint collation_connection_num;
......
sql/sql_cache.cc
View file @ 282855e9
...@@ -801,6 +801,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used) ...@@ -801,6 +801,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
CLIENT_PROTOCOL_41); CLIENT_PROTOCOL_41);
flags.more_results_exists= test(thd->server_status & flags.more_results_exists= test(thd->server_status &
SERVER_MORE_RESULTS_EXISTS); SERVER_MORE_RESULTS_EXISTS);
flags.pkt_nr= net->pkt_nr;
flags.character_set_client_num= flags.character_set_client_num=
thd->variables.character_set_client->number; thd->variables.character_set_client->number;
flags.character_set_results_num= flags.character_set_results_num=
...@@ -814,12 +815,13 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used) ...@@ -814,12 +815,13 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
flags.sql_mode= thd->variables.sql_mode; flags.sql_mode= thd->variables.sql_mode;
flags.max_sort_length= thd->variables.max_sort_length; flags.max_sort_length= thd->variables.max_sort_length;
flags.group_concat_max_len= thd->variables.group_concat_max_len; flags.group_concat_max_len= thd->variables.group_concat_max_len;
DBUG_PRINT("qcache", ("long %d, 4.1: %d, more results %d, \ DBUG_PRINT("qcache", ("long %d, 4.1: %d, more results %d, pkt_nr: %d, \
CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \ CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \
sql mode: 0x%lx, sort len: %lu, conncat len: %lu", sql mode: 0x%lx, sort len: %lu, conncat len: %lu",
(int)flags.client_long_flag, (int)flags.client_long_flag,
(int)flags.client_protocol_41, (int)flags.client_protocol_41,
(int)flags.more_results_exists, (int)flags.more_results_exists,
flags.pkt_nr,
flags.character_set_client_num, flags.character_set_client_num,
flags.character_set_results_num, flags.character_set_results_num,
flags.collation_connection_num, flags.collation_connection_num,
...@@ -1019,6 +1021,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) ...@@ -1019,6 +1021,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
CLIENT_PROTOCOL_41); CLIENT_PROTOCOL_41);
flags.more_results_exists= test(thd->server_status & flags.more_results_exists= test(thd->server_status &
SERVER_MORE_RESULTS_EXISTS); SERVER_MORE_RESULTS_EXISTS);
flags.pkt_nr= thd->net.pkt_nr;
flags.character_set_client_num= thd->variables.character_set_client->number; flags.character_set_client_num= thd->variables.character_set_client->number;
flags.character_set_results_num= flags.character_set_results_num=
(thd->variables.character_set_results ? (thd->variables.character_set_results ?
...@@ -1030,12 +1033,13 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) ...@@ -1030,12 +1033,13 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
flags.sql_mode= thd->variables.sql_mode; flags.sql_mode= thd->variables.sql_mode;
flags.max_sort_length= thd->variables.max_sort_length; flags.max_sort_length= thd->variables.max_sort_length;
flags.group_concat_max_len= thd->variables.group_concat_max_len; flags.group_concat_max_len= thd->variables.group_concat_max_len;
DBUG_PRINT("qcache", ("long %d, 4.1: %d, more results %d, \ DBUG_PRINT("qcache", ("long %d, 4.1: %d, more results %d, pkt_nr: %d, \
CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \ CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \
sql mode: 0x%lx, sort len: %lu, conncat len: %lu", sql mode: 0x%lx, sort len: %lu, conncat len: %lu",
(int)flags.client_long_flag, (int)flags.client_long_flag,
(int)flags.client_protocol_41, (int)flags.client_protocol_41,
(int)flags.more_results_exists, (int)flags.more_results_exists,
flags.pkt_nr,
flags.character_set_client_num, flags.character_set_client_num,
flags.character_set_results_num, flags.character_set_results_num,
flags.collation_connection_num, flags.collation_connection_num,
......
sql/sql_db.cc
View file @ 282855e9
...@@ -440,6 +440,7 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, ...@@ -440,6 +440,7 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db); ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
error= 0; error= 0;
if (!silent)
send_ok(thd); send_ok(thd);
goto exit; goto exit;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7