Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt libmysql/libmysql.c: Auto merged
This commit is contained in:
commit
6146c0c75d
@ -51,5 +51,5 @@ enum options_client
|
|||||||
OPT_TRIGGERS,
|
OPT_TRIGGERS,
|
||||||
OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
|
OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
|
||||||
OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT,
|
OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT,
|
||||||
OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE
|
OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE, OPT_DUMP_DATE
|
||||||
};
|
};
|
||||||
|
@ -89,7 +89,7 @@ static my_bool verbose= 0, opt_no_create_info= 0, opt_no_data= 0,
|
|||||||
opt_drop=1,opt_keywords=0,opt_lock=1,opt_compress=0,
|
opt_drop=1,opt_keywords=0,opt_lock=1,opt_compress=0,
|
||||||
opt_delayed=0,create_options=1,opt_quoted=0,opt_databases=0,
|
opt_delayed=0,create_options=1,opt_quoted=0,opt_databases=0,
|
||||||
opt_alldbs=0,opt_create_db=0,opt_lock_all_tables=0,
|
opt_alldbs=0,opt_create_db=0,opt_lock_all_tables=0,
|
||||||
opt_set_charset=0,
|
opt_set_charset=0, opt_dump_date=1,
|
||||||
opt_autocommit=0,opt_disable_keys=1,opt_xml=0,
|
opt_autocommit=0,opt_disable_keys=1,opt_xml=0,
|
||||||
opt_delete_master_logs=0, tty_password=0,
|
opt_delete_master_logs=0, tty_password=0,
|
||||||
opt_single_transaction=0, opt_comments= 0, opt_compact= 0,
|
opt_single_transaction=0, opt_comments= 0, opt_compact= 0,
|
||||||
@ -402,6 +402,9 @@ static struct my_option my_long_options[] =
|
|||||||
"automatically turns off --lock-tables.",
|
"automatically turns off --lock-tables.",
|
||||||
(gptr*) &opt_single_transaction, (gptr*) &opt_single_transaction, 0,
|
(gptr*) &opt_single_transaction, (gptr*) &opt_single_transaction, 0,
|
||||||
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
||||||
|
{"dump-date", OPT_DUMP_DATE, "Put a dump date to the end of the output.",
|
||||||
|
(gptr*) &opt_dump_date, (gptr*) &opt_dump_date, 0,
|
||||||
|
GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
|
||||||
{"skip-opt", OPT_SKIP_OPTIMIZATION,
|
{"skip-opt", OPT_SKIP_OPTIMIZATION,
|
||||||
"Disable --opt. Disables --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys.",
|
"Disable --opt. Disables --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys.",
|
||||||
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
||||||
@ -623,10 +626,15 @@ static void write_footer(FILE *sql_file)
|
|||||||
fputs("\n", sql_file);
|
fputs("\n", sql_file);
|
||||||
if (opt_comments)
|
if (opt_comments)
|
||||||
{
|
{
|
||||||
char time_str[20];
|
if (opt_dump_date)
|
||||||
get_date(time_str, GETDATE_DATE_TIME, 0);
|
{
|
||||||
fprintf(sql_file, "-- Dump completed on %s\n",
|
char time_str[20];
|
||||||
time_str);
|
get_date(time_str, GETDATE_DATE_TIME, 0);
|
||||||
|
fprintf(sql_file, "-- Dump completed on %s\n",
|
||||||
|
time_str);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
fprintf(sql_file, "-- Dump completed\n");
|
||||||
}
|
}
|
||||||
check_io(sql_file);
|
check_io(sql_file);
|
||||||
}
|
}
|
||||||
|
@ -4355,6 +4355,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field)
|
|||||||
case MYSQL_TYPE_STRING:
|
case MYSQL_TYPE_STRING:
|
||||||
case MYSQL_TYPE_DECIMAL:
|
case MYSQL_TYPE_DECIMAL:
|
||||||
case MYSQL_TYPE_NEWDECIMAL:
|
case MYSQL_TYPE_NEWDECIMAL:
|
||||||
|
case MYSQL_TYPE_NEWDATE:
|
||||||
DBUG_ASSERT(param->buffer_length != 0);
|
DBUG_ASSERT(param->buffer_length != 0);
|
||||||
param->fetch_result= fetch_result_str;
|
param->fetch_result= fetch_result_str;
|
||||||
break;
|
break;
|
||||||
@ -4427,6 +4428,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field)
|
|||||||
case MYSQL_TYPE_VAR_STRING:
|
case MYSQL_TYPE_VAR_STRING:
|
||||||
case MYSQL_TYPE_STRING:
|
case MYSQL_TYPE_STRING:
|
||||||
case MYSQL_TYPE_BIT:
|
case MYSQL_TYPE_BIT:
|
||||||
|
case MYSQL_TYPE_NEWDATE:
|
||||||
param->skip_result= skip_result_string;
|
param->skip_result= skip_result_string;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -483,15 +483,16 @@ static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
|
|||||||
uint key_length, uchar *page_buf, uint nod_flag)
|
uint key_length, uchar *page_buf, uint nod_flag)
|
||||||
{
|
{
|
||||||
double increase;
|
double increase;
|
||||||
double best_incr = DBL_MAX;
|
double best_incr;
|
||||||
double area;
|
double area;
|
||||||
double best_area;
|
double best_area;
|
||||||
uchar *best_key;
|
uchar *best_key= NULL;
|
||||||
uchar *k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
uchar *k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
||||||
uchar *last = rt_PAGE_END(page_buf);
|
uchar *last = rt_PAGE_END(page_buf);
|
||||||
|
|
||||||
LINT_INIT(best_area);
|
LINT_INIT(best_area);
|
||||||
LINT_INIT(best_key);
|
LINT_INIT(best_key);
|
||||||
|
LINT_INIT(best_incr);
|
||||||
|
|
||||||
for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag))
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag))
|
||||||
{
|
{
|
||||||
@ -500,22 +501,13 @@ static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
|
|||||||
&area)) == -1.0)
|
&area)) == -1.0)
|
||||||
return NULL;
|
return NULL;
|
||||||
/* The following should be safe, even if we compare doubles */
|
/* The following should be safe, even if we compare doubles */
|
||||||
if (increase < best_incr)
|
if (!best_key || increase < best_incr ||
|
||||||
|
((increase == best_incr) && (area < best_area)))
|
||||||
{
|
{
|
||||||
best_key = k;
|
best_key = k;
|
||||||
best_area = area;
|
best_area = area;
|
||||||
best_incr = increase;
|
best_incr = increase;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
/* The following should be safe, even if we compare doubles */
|
|
||||||
if ((increase == best_incr) && (area < best_area))
|
|
||||||
{
|
|
||||||
best_key = k;
|
|
||||||
best_area = area;
|
|
||||||
best_incr = increase;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return best_key;
|
return best_key;
|
||||||
}
|
}
|
||||||
|
@ -523,7 +523,10 @@ double rtree_overlapping_area(HA_KEYSEG *keyseg, uchar* a, uchar* b,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Calculates MBR_AREA(a+b) - MBR_AREA(a)
|
Calculates MBR_AREA(a+b) - MBR_AREA(a)
|
||||||
|
Note: when 'a' and 'b' objects are far from each other,
|
||||||
|
the area increase can be really big, so this function
|
||||||
|
can return 'inf' as a result.
|
||||||
*/
|
*/
|
||||||
double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
|
double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
|
||||||
uint key_length, double *ab_area)
|
uint key_length, double *ab_area)
|
||||||
|
@ -481,7 +481,7 @@ str_to_date(a,b)
|
|||||||
create table t2 select str_to_date(a,b) from t1;
|
create table t2 select str_to_date(a,b) from t1;
|
||||||
describe t2;
|
describe t2;
|
||||||
Field Type Null Key Default Extra
|
Field Type Null Key Default Extra
|
||||||
str_to_date(a,b) binary(29) YES NULL
|
str_to_date(a,b) datetime YES NULL
|
||||||
select str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S.%f") as f1,
|
select str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S.%f") as f1,
|
||||||
str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S") as f2,
|
str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S") as f2,
|
||||||
str_to_date("2003-01-02", "%Y-%m-%d") as f3,
|
str_to_date("2003-01-02", "%Y-%m-%d") as f3,
|
||||||
|
@ -322,4 +322,42 @@ mod(5, cast(-2 as unsigned)) mod(5, 18446744073709551614) mod(5, -2)
|
|||||||
select pow(cast(-2 as unsigned), 5), pow(18446744073709551614, 5), pow(-2, 5);
|
select pow(cast(-2 as unsigned), 5), pow(18446744073709551614, 5), pow(-2, 5);
|
||||||
pow(cast(-2 as unsigned), 5) pow(18446744073709551614, 5) pow(-2, 5)
|
pow(cast(-2 as unsigned), 5) pow(18446744073709551614, 5) pow(-2, 5)
|
||||||
2.1359870359209e+96 2.1359870359209e+96 -32
|
2.1359870359209e+96 2.1359870359209e+96 -32
|
||||||
|
CREATE TABLE t1 (a timestamp, b varchar(20), c bit(1));
|
||||||
|
INSERT INTO t1 VALUES('1998-09-23', 'str1', 1), ('2003-03-25', 'str2', 0);
|
||||||
|
SELECT a DIV 900 y FROM t1 GROUP BY y;
|
||||||
|
y
|
||||||
|
22201025555
|
||||||
|
22255916666
|
||||||
|
SELECT DISTINCT a DIV 900 y FROM t1;
|
||||||
|
y
|
||||||
|
22201025555
|
||||||
|
22255916666
|
||||||
|
SELECT b DIV 900 y FROM t1 GROUP BY y;
|
||||||
|
y
|
||||||
|
0
|
||||||
|
SELECT c DIV 900 y FROM t1 GROUP BY y;
|
||||||
|
y
|
||||||
|
0
|
||||||
|
DROP TABLE t1;
|
||||||
|
CREATE TABLE t1(a LONGBLOB);
|
||||||
|
INSERT INTO t1 VALUES('1'),('2'),('3');
|
||||||
|
SELECT DISTINCT (a DIV 254576881) FROM t1;
|
||||||
|
(a DIV 254576881)
|
||||||
|
0
|
||||||
|
SELECT (a DIV 254576881) FROM t1 UNION ALL
|
||||||
|
SELECT (a DIV 254576881) FROM t1;
|
||||||
|
(a DIV 254576881)
|
||||||
|
0
|
||||||
|
0
|
||||||
|
0
|
||||||
|
0
|
||||||
|
0
|
||||||
|
0
|
||||||
|
DROP TABLE t1;
|
||||||
|
CREATE TABLE t1(a SET('a','b','c'));
|
||||||
|
INSERT INTO t1 VALUES ('a');
|
||||||
|
SELECT a DIV 2 FROM t1 UNION SELECT a DIV 2 FROM t1;
|
||||||
|
a DIV 2
|
||||||
|
0
|
||||||
|
DROP TABLE t1;
|
||||||
End of 5.0 tests
|
End of 5.0 tests
|
||||||
|
@ -185,4 +185,26 @@ ERROR 21000: Operand should contain 1 column(s)
|
|||||||
drop table table_26093;
|
drop table table_26093;
|
||||||
drop function func_26093_a;
|
drop function func_26093_a;
|
||||||
drop function func_26093_b;
|
drop function func_26093_b;
|
||||||
|
SELECT NAME_CONST('test', NOW());
|
||||||
|
ERROR HY000: Incorrect arguments to NAME_CONST
|
||||||
|
SELECT NAME_CONST('test', UPPER('test'));
|
||||||
|
ERROR HY000: Incorrect arguments to NAME_CONST
|
||||||
|
SELECT NAME_CONST('test', NULL);
|
||||||
|
test
|
||||||
|
NULL
|
||||||
|
SELECT NAME_CONST('test', 1);
|
||||||
|
test
|
||||||
|
1
|
||||||
|
SELECT NAME_CONST('test', -1);
|
||||||
|
test
|
||||||
|
-1
|
||||||
|
SELECT NAME_CONST('test', 1.0);
|
||||||
|
test
|
||||||
|
1.0
|
||||||
|
SELECT NAME_CONST('test', -1.0);
|
||||||
|
test
|
||||||
|
-1.0
|
||||||
|
SELECT NAME_CONST('test', 'test');
|
||||||
|
test
|
||||||
|
test
|
||||||
End of 5.0 tests
|
End of 5.0 tests
|
||||||
|
@ -196,7 +196,7 @@ f2 datetime YES NULL
|
|||||||
f3 time YES NULL
|
f3 time YES NULL
|
||||||
f4 time YES NULL
|
f4 time YES NULL
|
||||||
f5 time YES NULL
|
f5 time YES NULL
|
||||||
f6 time NO 00:00:00
|
f6 time YES NULL
|
||||||
f7 datetime YES NULL
|
f7 datetime YES NULL
|
||||||
f8 date YES NULL
|
f8 date YES NULL
|
||||||
f9 time YES NULL
|
f9 time YES NULL
|
||||||
|
@ -1027,6 +1027,15 @@ fmtddate field2
|
|||||||
Sep-4 12:00AM abcd
|
Sep-4 12:00AM abcd
|
||||||
DROP TABLE testBug8868;
|
DROP TABLE testBug8868;
|
||||||
SET NAMES DEFAULT;
|
SET NAMES DEFAULT;
|
||||||
|
CREATE TABLE t1 (
|
||||||
|
a TIMESTAMP
|
||||||
|
);
|
||||||
|
INSERT INTO t1 VALUES (now()), (now());
|
||||||
|
SELECT 1 FROM t1 ORDER BY MAKETIME(1, 1, a);
|
||||||
|
1
|
||||||
|
1
|
||||||
|
1
|
||||||
|
DROP TABLE t1;
|
||||||
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H)
|
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H)
|
||||||
union
|
union
|
||||||
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H);
|
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H);
|
||||||
|
@ -1425,6 +1425,37 @@ CHECK TABLE t1 EXTENDED;
|
|||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
create table t1 (a geometry not null, spatial index(a));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 131072)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(9.1248812352444e+192, 2.9740338169556e+284)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.7783097267365e-299, -0)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.49166814624e-154, 2.0880974297595e-53)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.0917382598702e+149, 1.2024538023802e+111)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.0349165139404e+236, 2.9993936277913e-241)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.5243548967072e-29, 1.2024538023802e+111)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(0, 6.9835074892995e-251)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 3.1050361846014e+231)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.8728483499323e-188, 2.4600631144627e+260)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(3.0517578125e-05, 2.0349165139404e+236)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 1.1818212630766e-125)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.481040258324e-265, 5.7766220027675e-275)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 2.5243548967072e-29)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(5.7766220027675e-275, 9.9464647281957e+86)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.2181357552967e+130, 3.7857669957337e-270)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.5767114681874e-246, 3.6893488147419e+19)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.5767114681874e-246, 3.7537584144024e+255)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(3.7857669957337e-270, 1.8033161362863e-130)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(0, 5.8774717541114e-39)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 2.2761049594727e-159)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(6.243497100632e+144, 3.7857669957337e-270)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(3.7857669957337e-270, 2.6355494858076e-82)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.0349165139404e+236, 3.8518598887745e-34)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.6566128730774e-10, 2.0880974297595e-53)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 1.8827498946116e-183)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.8033161362863e-130, 9.1248812352444e+192)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.7783097267365e-299, 2.2761049594727e-159)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.94906280228e+289, 1.2338789709327e-178)));
|
||||||
|
drop table t1;
|
||||||
CREATE TABLE t1(foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );
|
CREATE TABLE t1(foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );
|
||||||
INSERT INTO t1(foo) VALUES (NULL);
|
INSERT INTO t1(foo) VALUES (NULL);
|
||||||
ERROR 23000: Column 'foo' cannot be null
|
ERROR 23000: Column 'foo' cannot be null
|
||||||
|
@ -736,6 +736,12 @@ SELECT * FROM t1;
|
|||||||
a
|
a
|
||||||
NULL
|
NULL
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
CREATE TABLE `t1` ( `col9` set('a'), `col89` date);
|
||||||
|
INSERT INTO `t1` VALUES ('','0000-00-00');
|
||||||
|
select geomfromtext(col9,col89) as a from t1;
|
||||||
|
a
|
||||||
|
NULL
|
||||||
|
DROP TABLE t1;
|
||||||
End of 4.1 tests
|
End of 4.1 tests
|
||||||
create table t1 (s1 geometry not null,s2 char(100));
|
create table t1 (s1 geometry not null,s2 char(100));
|
||||||
create trigger t1_bu before update on t1 for each row set new.s1 = null;
|
create trigger t1_bu before update on t1 for each row set new.s1 = null;
|
||||||
|
@ -421,4 +421,22 @@ revoke all privileges, grant option from mysqltest_1@localhost;
|
|||||||
revoke all privileges, grant option from mysqltest_2@localhost;
|
revoke all privileges, grant option from mysqltest_2@localhost;
|
||||||
drop user mysqltest_1@localhost;
|
drop user mysqltest_1@localhost;
|
||||||
drop user mysqltest_2@localhost;
|
drop user mysqltest_2@localhost;
|
||||||
|
CREATE DATABASE db1;
|
||||||
|
USE db1;
|
||||||
|
CREATE TABLE t1 (a INT, b INT);
|
||||||
|
INSERT INTO t1 VALUES (1,1),(2,2);
|
||||||
|
CREATE TABLE t2 (b INT, c INT);
|
||||||
|
INSERT INTO t2 VALUES (1,100),(2,200);
|
||||||
|
GRANT SELECT ON t1 TO mysqltest1@localhost;
|
||||||
|
GRANT SELECT (b) ON t2 TO mysqltest1@localhost;
|
||||||
|
USE db1;
|
||||||
|
SELECT c FROM t2;
|
||||||
|
ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2'
|
||||||
|
SELECT * FROM t2;
|
||||||
|
ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2'
|
||||||
|
SELECT * FROM t1 JOIN t2 USING (b);
|
||||||
|
ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2'
|
||||||
|
DROP TABLE db1.t1, db1.t2;
|
||||||
|
DROP USER mysqltest1@localhost;
|
||||||
|
DROP DATABASE db1;
|
||||||
End of 5.0 tests
|
End of 5.0 tests
|
||||||
|
@ -1386,3 +1386,7 @@ f7 datetime NO NULL
|
|||||||
f8 datetime YES 2006-01-01 00:00:00
|
f8 datetime YES 2006-01-01 00:00:00
|
||||||
drop table t1;
|
drop table t1;
|
||||||
End of 5.0 tests.
|
End of 5.0 tests.
|
||||||
|
show fields from information_schema.table_names;
|
||||||
|
ERROR 42S02: Unknown table 'table_names' in information_schema
|
||||||
|
show keys from information_schema.table_names;
|
||||||
|
ERROR 42S02: Unknown table 'table_names' in information_schema
|
||||||
|
@ -830,3 +830,15 @@ id prev_id join_id
|
|||||||
3 2 0
|
3 2 0
|
||||||
4 3 0
|
4 3 0
|
||||||
DROP TABLE t1,t2;
|
DROP TABLE t1,t2;
|
||||||
|
#
|
||||||
|
# Bug#30384: Having SQL_BUFFER_RESULT option in the
|
||||||
|
# CREATE .. KEY(..) .. SELECT led to creating corrupted index.
|
||||||
|
#
|
||||||
|
create table t1(f1 int);
|
||||||
|
insert into t1 values(1),(2),(3);
|
||||||
|
create table t2 (key(f1)) engine=myisam select sql_buffer_result f1 from t1;
|
||||||
|
check table t2 extended;
|
||||||
|
Table Op Msg_type Msg_text
|
||||||
|
test.t2 check status OK
|
||||||
|
drop table t1,t2;
|
||||||
|
##################################################################
|
||||||
|
@ -3544,5 +3544,27 @@ c1
|
|||||||
2
|
2
|
||||||
DROP TABLE t1,t2;
|
DROP TABLE t1,t2;
|
||||||
#
|
#
|
||||||
|
# Bug#29815: new option for suppressing last line of mysqldump:
|
||||||
|
# "Dump completed on"
|
||||||
|
#
|
||||||
|
# --skip-dump-date:
|
||||||
|
--
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- Dump completed
|
||||||
|
# --dump-date:
|
||||||
|
--
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- Dump completed on DATE
|
||||||
|
# --dump-date (default):
|
||||||
|
--
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- Dump completed on DATE
|
||||||
|
#
|
||||||
# End of 5.0 tests
|
# End of 5.0 tests
|
||||||
#
|
#
|
||||||
|
@ -715,3 +715,14 @@ a SUM(a)
|
|||||||
4 4
|
4 4
|
||||||
NULL 14
|
NULL 14
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
#
|
||||||
|
# Bug#31095: Unexpected NULL constant caused server crash.
|
||||||
|
#
|
||||||
|
create table t1(a int);
|
||||||
|
insert into t1 values (1),(2),(3);
|
||||||
|
select count(a) from t1 group by null with rollup;
|
||||||
|
count(a)
|
||||||
|
3
|
||||||
|
3
|
||||||
|
drop table t1;
|
||||||
|
##############################################################
|
||||||
|
@ -4,6 +4,13 @@ reset master;
|
|||||||
reset slave;
|
reset slave;
|
||||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||||
start slave;
|
start slave;
|
||||||
|
show variables like 'relay_log%';
|
||||||
|
Variable_name Value
|
||||||
|
relay_log MYSQLTEST_VARDIR/master-data/relay-log
|
||||||
|
relay_log_index
|
||||||
|
relay_log_info_file relay-log.info
|
||||||
|
relay_log_purge ON
|
||||||
|
relay_log_space_limit 0
|
||||||
stop slave;
|
stop slave;
|
||||||
change master to master_host='127.0.0.1',master_user='root',
|
change master to master_host='127.0.0.1',master_user='root',
|
||||||
master_password='',master_port=MASTER_PORT;
|
master_password='',master_port=MASTER_PORT;
|
||||||
|
@ -136,3 +136,13 @@ d dt ts
|
|||||||
0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00
|
0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00
|
||||||
2001-11-11 2001-11-11 00:00:00 2001-11-11 00:00:00
|
2001-11-11 2001-11-11 00:00:00 2001-11-11 00:00:00
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
CREATE TABLE t1 (
|
||||||
|
a INT
|
||||||
|
);
|
||||||
|
INSERT INTO t1 VALUES (1);
|
||||||
|
INSERT INTO t1 VALUES (NULL);
|
||||||
|
SELECT str_to_date( '', a ) FROM t1;
|
||||||
|
str_to_date( '', a )
|
||||||
|
0000-00-00 00:00:00
|
||||||
|
NULL
|
||||||
|
DROP TABLE t1;
|
||||||
|
@ -427,3 +427,64 @@ f1
|
|||||||
Warnings:
|
Warnings:
|
||||||
Warning 1292 Incorrect datetime value: '2007010100000' for column 'f1' at row 1
|
Warning 1292 Incorrect datetime value: '2007010100000' for column 'f1' at row 1
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
#
|
||||||
|
# Bug#27216: functions with parameters of different date types may
|
||||||
|
# return wrong type of the result.
|
||||||
|
#
|
||||||
|
create table t1 (f1 date, f2 datetime, f3 varchar(20));
|
||||||
|
create table t2 as select coalesce(f1,f1) as f4 from t1;
|
||||||
|
desc t2;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 date YES NULL
|
||||||
|
create table t3 as select coalesce(f1,f2) as f4 from t1;
|
||||||
|
desc t3;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 datetime YES NULL
|
||||||
|
create table t4 as select coalesce(f2,f2) as f4 from t1;
|
||||||
|
desc t4;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 datetime YES NULL
|
||||||
|
create table t5 as select coalesce(f1,f3) as f4 from t1;
|
||||||
|
desc t5;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 varbinary(20) YES NULL
|
||||||
|
create table t6 as select coalesce(f2,f3) as f4 from t1;
|
||||||
|
desc t6;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 varbinary(20) YES NULL
|
||||||
|
create table t7 as select coalesce(makedate(1997,1),f2) as f4 from t1;
|
||||||
|
desc t7;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 datetime YES NULL
|
||||||
|
create table t8 as select coalesce(cast('01-01-01' as datetime),f2) as f4
|
||||||
|
from t1;
|
||||||
|
desc t8;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 datetime YES NULL
|
||||||
|
create table t9 as select case when 1 then cast('01-01-01' as date)
|
||||||
|
when 0 then cast('01-01-01' as date) end as f4 from t1;
|
||||||
|
desc t9;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 date YES NULL
|
||||||
|
create table t10 as select case when 1 then cast('01-01-01' as datetime)
|
||||||
|
when 0 then cast('01-01-01' as datetime) end as f4 from t1;
|
||||||
|
desc t10;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 datetime YES NULL
|
||||||
|
create table t11 as select if(1, cast('01-01-01' as datetime),
|
||||||
|
cast('01-01-01' as date)) as f4 from t1;
|
||||||
|
desc t11;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 datetime YES NULL
|
||||||
|
create table t12 as select least(cast('01-01-01' as datetime),
|
||||||
|
cast('01-01-01' as date)) as f4 from t1;
|
||||||
|
desc t12;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 datetime YES NULL
|
||||||
|
create table t13 as select ifnull(cast('01-01-01' as datetime),
|
||||||
|
cast('01-01-01' as date)) as f4 from t1;
|
||||||
|
desc t13;
|
||||||
|
Field Type Null Key Default Extra
|
||||||
|
f4 datetime YES NULL
|
||||||
|
drop tables t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13;
|
||||||
|
###################################################################
|
||||||
|
@ -625,7 +625,7 @@ drop table t1;
|
|||||||
create table t1 (a int, b int);
|
create table t1 (a int, b int);
|
||||||
create view v1 as select a, sum(b) from t1 group by a;
|
create view v1 as select a, sum(b) from t1 group by a;
|
||||||
select b from v1 use index (some_index) where b=1;
|
select b from v1 use index (some_index) where b=1;
|
||||||
ERROR HY000: Key 'some_index' doesn't exist in table 'v1'
|
ERROR HY000: Incorrect usage of USE INDEX and VIEW
|
||||||
drop view v1;
|
drop view v1;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
create table t1 (col1 char(5),col2 char(5));
|
create table t1 (col1 char(5),col2 char(5));
|
||||||
@ -2706,18 +2706,19 @@ CREATE TABLE t1(
|
|||||||
fName varchar(25) NOT NULL,
|
fName varchar(25) NOT NULL,
|
||||||
lName varchar(25) NOT NULL,
|
lName varchar(25) NOT NULL,
|
||||||
DOB date NOT NULL,
|
DOB date NOT NULL,
|
||||||
|
test_date date NOT NULL,
|
||||||
uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY);
|
uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY);
|
||||||
INSERT INTO t1(fName, lName, DOB) VALUES
|
INSERT INTO t1(fName, lName, DOB, test_date) VALUES
|
||||||
('Hank', 'Hill', '1964-09-29'),
|
('Hank', 'Hill', '1964-09-29', '2007-01-01'),
|
||||||
('Tom', 'Adams', '1908-02-14'),
|
('Tom', 'Adams', '1908-02-14', '2007-01-01'),
|
||||||
('Homer', 'Simpson', '1968-03-05');
|
('Homer', 'Simpson', '1968-03-05', '2007-01-01');
|
||||||
CREATE VIEW v1 AS
|
CREATE VIEW v1 AS
|
||||||
SELECT (year(now())-year(DOB)) AS Age
|
SELECT (year(test_date)-year(DOB)) AS Age
|
||||||
FROM t1 HAVING Age < 75;
|
FROM t1 HAVING Age < 75;
|
||||||
SHOW CREATE VIEW v1;
|
SHOW CREATE VIEW v1;
|
||||||
View Create View
|
View Create View
|
||||||
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(now()) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75)
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(`t1`.`test_date`) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75)
|
||||||
SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75;
|
SELECT (year(test_date)-year(DOB)) AS Age FROM t1 HAVING Age < 75;
|
||||||
Age
|
Age
|
||||||
43
|
43
|
||||||
39
|
39
|
||||||
@ -3562,4 +3563,43 @@ table_name is_updatable
|
|||||||
v1 NO
|
v1 NO
|
||||||
drop view v1;
|
drop view v1;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
CREATE TABLE t1 (a INT);
|
||||||
|
INSERT INTO t1 VALUES (1),(2);
|
||||||
|
CREATE VIEW v1 AS SELECT * FROM t1;
|
||||||
|
SELECT * FROM v1 USE KEY(non_existant);
|
||||||
|
ERROR HY000: Incorrect usage of USE INDEX and VIEW
|
||||||
|
SELECT * FROM v1 FORCE KEY(non_existant);
|
||||||
|
ERROR HY000: Incorrect usage of FORCE INDEX and VIEW
|
||||||
|
SELECT * FROM v1 IGNORE KEY(non_existant);
|
||||||
|
ERROR HY000: Incorrect usage of IGNORE INDEX and VIEW
|
||||||
|
DROP VIEW v1;
|
||||||
|
DROP TABLE t1;
|
||||||
|
CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b INT NOT NULL DEFAULT 0,
|
||||||
|
PRIMARY KEY(a), KEY (b));
|
||||||
|
INSERT INTO t1 VALUES (),(),(),(),(),(),(),(),(),(),(),(),(),(),();
|
||||||
|
CREATE VIEW v1 AS SELECT * FROM t1 FORCE KEY (PRIMARY,b) ORDER BY a;
|
||||||
|
SHOW CREATE VIEW v1;
|
||||||
|
View Create View
|
||||||
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a`,`t1`.`b` AS `b` from `t1` FORCE INDEX (PRIMARY,`b`) order by `t1`.`a`
|
||||||
|
EXPLAIN SELECT * FROM v1;
|
||||||
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 index NULL PRIMARY 4 NULL 15
|
||||||
|
CREATE VIEW v2 AS SELECT * FROM t1 USE KEY () ORDER BY a;
|
||||||
|
SHOW CREATE VIEW v2;
|
||||||
|
View Create View
|
||||||
|
v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t1`.`a` AS `a`,`t1`.`b` AS `b` from `t1` USE INDEX () order by `t1`.`a`
|
||||||
|
EXPLAIN SELECT * FROM v2;
|
||||||
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 ALL NULL NULL NULL NULL 15 Using filesort
|
||||||
|
CREATE VIEW v3 AS SELECT * FROM t1 IGNORE KEY (b) ORDER BY a;
|
||||||
|
SHOW CREATE VIEW v3;
|
||||||
|
View Create View
|
||||||
|
v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`a` AS `a`,`t1`.`b` AS `b` from `t1` IGNORE INDEX (`b`) order by `t1`.`a`
|
||||||
|
EXPLAIN SELECT * FROM v3;
|
||||||
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 ALL NULL NULL NULL NULL 15 Using filesort
|
||||||
|
DROP VIEW v1;
|
||||||
|
DROP VIEW v2;
|
||||||
|
DROP VIEW v3;
|
||||||
|
DROP TABLE t1;
|
||||||
End of 5.0 tests.
|
End of 5.0 tests.
|
||||||
|
@ -776,15 +776,60 @@ GRANT CREATE VIEW ON db26813.v2 TO u26813@localhost;
|
|||||||
GRANT DROP, CREATE VIEW ON db26813.v3 TO u26813@localhost;
|
GRANT DROP, CREATE VIEW ON db26813.v3 TO u26813@localhost;
|
||||||
GRANT SELECT ON db26813.t1 TO u26813@localhost;
|
GRANT SELECT ON db26813.t1 TO u26813@localhost;
|
||||||
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
||||||
ERROR 42000: CREATE VIEW command denied to user 'u26813'@'localhost' for table 'v1'
|
ERROR 42000: Access denied; you need the SUPER privilege for this operation
|
||||||
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
||||||
ERROR 42000: DROP command denied to user 'u26813'@'localhost' for table 'v2'
|
ERROR 42000: Access denied; you need the SUPER privilege for this operation
|
||||||
ALTER VIEW v3 AS SELECT f2 FROM t1;
|
ALTER VIEW v3 AS SELECT f2 FROM t1;
|
||||||
|
ERROR 42000: Access denied; you need the SUPER privilege for this operation
|
||||||
SHOW CREATE VIEW v3;
|
SHOW CREATE VIEW v3;
|
||||||
View Create View
|
View Create View
|
||||||
v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`f2` AS `f2` from `t1`
|
v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`f1` AS `f1` from `t1`
|
||||||
DROP USER u26813@localhost;
|
DROP USER u26813@localhost;
|
||||||
DROP DATABASE db26813;
|
DROP DATABASE db26813;
|
||||||
|
#
|
||||||
|
# Bug#29908: A user can gain additional access through the ALTER VIEW.
|
||||||
|
#
|
||||||
|
CREATE DATABASE mysqltest_29908;
|
||||||
|
USE mysqltest_29908;
|
||||||
|
CREATE TABLE t1(f1 INT, f2 INT);
|
||||||
|
CREATE USER u29908_1@localhost;
|
||||||
|
CREATE DEFINER = u29908_1@localhost VIEW v1 AS SELECT f1 FROM t1;
|
||||||
|
CREATE DEFINER = u29908_1@localhost SQL SECURITY INVOKER VIEW v2 AS
|
||||||
|
SELECT f1 FROM t1;
|
||||||
|
GRANT DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v1 TO u29908_1@localhost;
|
||||||
|
GRANT DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v2 TO u29908_1@localhost;
|
||||||
|
GRANT SELECT ON mysqltest_29908.t1 TO u29908_1@localhost;
|
||||||
|
CREATE USER u29908_2@localhost;
|
||||||
|
GRANT DROP, CREATE VIEW ON mysqltest_29908.v1 TO u29908_2@localhost;
|
||||||
|
GRANT DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v2 TO u29908_2@localhost;
|
||||||
|
GRANT SELECT ON mysqltest_29908.t1 TO u29908_2@localhost;
|
||||||
|
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
||||||
|
ERROR 42000: Access denied; you need the SUPER privilege for this operation
|
||||||
|
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
||||||
|
ERROR 42000: Access denied; you need the SUPER privilege for this operation
|
||||||
|
SHOW CREATE VIEW v2;
|
||||||
|
View Create View
|
||||||
|
v2 CREATE ALGORITHM=UNDEFINED DEFINER=`u29908_1`@`localhost` SQL SECURITY INVOKER VIEW `v2` AS select `t1`.`f1` AS `f1` from `t1`
|
||||||
|
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
||||||
|
SHOW CREATE VIEW v1;
|
||||||
|
View Create View
|
||||||
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`u29908_1`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f2` AS `f2` from `t1`
|
||||||
|
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
||||||
|
SHOW CREATE VIEW v2;
|
||||||
|
View Create View
|
||||||
|
v2 CREATE ALGORITHM=UNDEFINED DEFINER=`u29908_1`@`localhost` SQL SECURITY INVOKER VIEW `v2` AS select `t1`.`f2` AS `f2` from `t1`
|
||||||
|
ALTER VIEW v1 AS SELECT f1 FROM t1;
|
||||||
|
SHOW CREATE VIEW v1;
|
||||||
|
View Create View
|
||||||
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`u29908_1`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`
|
||||||
|
ALTER VIEW v2 AS SELECT f1 FROM t1;
|
||||||
|
SHOW CREATE VIEW v2;
|
||||||
|
View Create View
|
||||||
|
v2 CREATE ALGORITHM=UNDEFINED DEFINER=`u29908_1`@`localhost` SQL SECURITY INVOKER VIEW `v2` AS select `t1`.`f1` AS `f1` from `t1`
|
||||||
|
DROP USER u29908_1@localhost;
|
||||||
|
DROP USER u29908_2@localhost;
|
||||||
|
DROP DATABASE mysqltest_29908;
|
||||||
|
#######################################################################
|
||||||
DROP DATABASE IF EXISTS mysqltest1;
|
DROP DATABASE IF EXISTS mysqltest1;
|
||||||
DROP DATABASE IF EXISTS mysqltest2;
|
DROP DATABASE IF EXISTS mysqltest2;
|
||||||
CREATE DATABASE mysqltest1;
|
CREATE DATABASE mysqltest1;
|
||||||
|
@ -205,4 +205,29 @@ select mod(cast(-2 as unsigned), 3), mod(18446744073709551614, 3), mod(-2, 3);
|
|||||||
select mod(5, cast(-2 as unsigned)), mod(5, 18446744073709551614), mod(5, -2);
|
select mod(5, cast(-2 as unsigned)), mod(5, 18446744073709551614), mod(5, -2);
|
||||||
select pow(cast(-2 as unsigned), 5), pow(18446744073709551614, 5), pow(-2, 5);
|
select pow(cast(-2 as unsigned), 5), pow(18446744073709551614, 5), pow(-2, 5);
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #30587: mysql crashes when trying to group by TIME div NUMBER
|
||||||
|
#
|
||||||
|
|
||||||
|
CREATE TABLE t1 (a timestamp, b varchar(20), c bit(1));
|
||||||
|
INSERT INTO t1 VALUES('1998-09-23', 'str1', 1), ('2003-03-25', 'str2', 0);
|
||||||
|
SELECT a DIV 900 y FROM t1 GROUP BY y;
|
||||||
|
SELECT DISTINCT a DIV 900 y FROM t1;
|
||||||
|
SELECT b DIV 900 y FROM t1 GROUP BY y;
|
||||||
|
SELECT c DIV 900 y FROM t1 GROUP BY y;
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
CREATE TABLE t1(a LONGBLOB);
|
||||||
|
INSERT INTO t1 VALUES('1'),('2'),('3');
|
||||||
|
SELECT DISTINCT (a DIV 254576881) FROM t1;
|
||||||
|
SELECT (a DIV 254576881) FROM t1 UNION ALL
|
||||||
|
SELECT (a DIV 254576881) FROM t1;
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
CREATE TABLE t1(a SET('a','b','c'));
|
||||||
|
INSERT INTO t1 VALUES ('a');
|
||||||
|
SELECT a DIV 2 FROM t1 UNION SELECT a DIV 2 FROM t1;
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
|
||||||
--echo End of 5.0 tests
|
--echo End of 5.0 tests
|
||||||
|
@ -189,4 +189,20 @@ drop table table_26093;
|
|||||||
drop function func_26093_a;
|
drop function func_26093_a;
|
||||||
drop function func_26093_b;
|
drop function func_26093_b;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #30832: Assertion + crash with select name_const('test',now());
|
||||||
|
#
|
||||||
|
--error ER_WRONG_ARGUMENTS
|
||||||
|
SELECT NAME_CONST('test', NOW());
|
||||||
|
--error ER_WRONG_ARGUMENTS
|
||||||
|
SELECT NAME_CONST('test', UPPER('test'));
|
||||||
|
|
||||||
|
SELECT NAME_CONST('test', NULL);
|
||||||
|
SELECT NAME_CONST('test', 1);
|
||||||
|
SELECT NAME_CONST('test', -1);
|
||||||
|
SELECT NAME_CONST('test', 1.0);
|
||||||
|
SELECT NAME_CONST('test', -1.0);
|
||||||
|
SELECT NAME_CONST('test', 'test');
|
||||||
|
|
||||||
--echo End of 5.0 tests
|
--echo End of 5.0 tests
|
||||||
|
|
||||||
|
@ -545,6 +545,16 @@ DROP TABLE testBug8868;
|
|||||||
|
|
||||||
SET NAMES DEFAULT;
|
SET NAMES DEFAULT;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #31160: MAKETIME() crashes server when returning NULL in ORDER BY using
|
||||||
|
# filesort
|
||||||
|
#
|
||||||
|
CREATE TABLE t1 (
|
||||||
|
a TIMESTAMP
|
||||||
|
);
|
||||||
|
INSERT INTO t1 VALUES (now()), (now());
|
||||||
|
SELECT 1 FROM t1 ORDER BY MAKETIME(1, 1, a);
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Bug #19844 time_format in Union truncates values
|
# Bug #19844 time_format in Union truncates values
|
||||||
|
@ -797,6 +797,42 @@ UPDATE t1 set spatial_point=GeomFromText('POINT(41 46)') where c1 like 'f%';
|
|||||||
CHECK TABLE t1 EXTENDED;
|
CHECK TABLE t1 EXTENDED;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #30286 spatial index cause corruption and server crash!
|
||||||
|
#
|
||||||
|
|
||||||
|
create table t1 (a geometry not null, spatial index(a));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 131072)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(9.1248812352444e+192, 2.9740338169556e+284)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.7783097267365e-299, -0)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.49166814624e-154, 2.0880974297595e-53)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.0917382598702e+149, 1.2024538023802e+111)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.0349165139404e+236, 2.9993936277913e-241)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.5243548967072e-29, 1.2024538023802e+111)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(0, 6.9835074892995e-251)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 3.1050361846014e+231)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.8728483499323e-188, 2.4600631144627e+260)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(3.0517578125e-05, 2.0349165139404e+236)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 1.1818212630766e-125)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.481040258324e-265, 5.7766220027675e-275)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 2.5243548967072e-29)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(5.7766220027675e-275, 9.9464647281957e+86)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.2181357552967e+130, 3.7857669957337e-270)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.5767114681874e-246, 3.6893488147419e+19)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.5767114681874e-246, 3.7537584144024e+255)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(3.7857669957337e-270, 1.8033161362863e-130)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(0, 5.8774717541114e-39)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 2.2761049594727e-159)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(6.243497100632e+144, 3.7857669957337e-270)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(3.7857669957337e-270, 2.6355494858076e-82)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.0349165139404e+236, 3.8518598887745e-34)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.6566128730774e-10, 2.0880974297595e-53)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 1.8827498946116e-183)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.8033161362863e-130, 9.1248812352444e+192)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(4.7783097267365e-299, 2.2761049594727e-159)));
|
||||||
|
insert into t1 values (PointFromWKB(POINT(1.94906280228e+289, 1.2338789709327e-178)));
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
# End of 4.1 tests
|
# End of 4.1 tests
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -431,6 +431,14 @@ INSERT INTO t1 VALUES (NULL);
|
|||||||
SELECT * FROM t1;
|
SELECT * FROM t1;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #30955 geomfromtext() crasher
|
||||||
|
#
|
||||||
|
CREATE TABLE `t1` ( `col9` set('a'), `col89` date);
|
||||||
|
INSERT INTO `t1` VALUES ('','0000-00-00');
|
||||||
|
select geomfromtext(col9,col89) as a from t1;
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
--echo End of 4.1 tests
|
--echo End of 4.1 tests
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -585,5 +585,37 @@ drop user mysqltest_1@localhost;
|
|||||||
drop user mysqltest_2@localhost;
|
drop user mysqltest_2@localhost;
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #30468: column level privileges not respected when joining tables
|
||||||
|
#
|
||||||
|
CREATE DATABASE db1;
|
||||||
|
|
||||||
|
USE db1;
|
||||||
|
CREATE TABLE t1 (a INT, b INT);
|
||||||
|
INSERT INTO t1 VALUES (1,1),(2,2);
|
||||||
|
|
||||||
|
CREATE TABLE t2 (b INT, c INT);
|
||||||
|
INSERT INTO t2 VALUES (1,100),(2,200);
|
||||||
|
|
||||||
|
GRANT SELECT ON t1 TO mysqltest1@localhost;
|
||||||
|
GRANT SELECT (b) ON t2 TO mysqltest1@localhost;
|
||||||
|
|
||||||
|
connect (conn1,localhost,mysqltest1,,);
|
||||||
|
connection conn1;
|
||||||
|
USE db1;
|
||||||
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
||||||
|
SELECT c FROM t2;
|
||||||
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
||||||
|
SELECT * FROM t2;
|
||||||
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
||||||
|
SELECT * FROM t1 JOIN t2 USING (b);
|
||||||
|
|
||||||
|
connection default;
|
||||||
|
disconnect conn1;
|
||||||
|
DROP TABLE db1.t1, db1.t2;
|
||||||
|
DROP USER mysqltest1@localhost;
|
||||||
|
DROP DATABASE db1;
|
||||||
|
|
||||||
|
|
||||||
--echo End of 5.0 tests
|
--echo End of 5.0 tests
|
||||||
|
|
||||||
|
@ -1089,3 +1089,12 @@ show columns from t1;
|
|||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
--echo End of 5.0 tests.
|
--echo End of 5.0 tests.
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug#30079 A check for "hidden" I_S tables is flawed
|
||||||
|
#
|
||||||
|
--error 1109
|
||||||
|
show fields from information_schema.table_names;
|
||||||
|
--error 1109
|
||||||
|
show keys from information_schema.table_names;
|
||||||
|
|
||||||
|
@ -385,3 +385,15 @@ INSERT INTO t1 (prev_id) SELECT id
|
|||||||
SELECT * FROM t1;
|
SELECT * FROM t1;
|
||||||
|
|
||||||
DROP TABLE t1,t2;
|
DROP TABLE t1,t2;
|
||||||
|
|
||||||
|
--echo #
|
||||||
|
--echo # Bug#30384: Having SQL_BUFFER_RESULT option in the
|
||||||
|
--echo # CREATE .. KEY(..) .. SELECT led to creating corrupted index.
|
||||||
|
--echo #
|
||||||
|
create table t1(f1 int);
|
||||||
|
insert into t1 values(1),(2),(3);
|
||||||
|
create table t2 (key(f1)) engine=myisam select sql_buffer_result f1 from t1;
|
||||||
|
check table t2 extended;
|
||||||
|
drop table t1,t2;
|
||||||
|
--echo ##################################################################
|
||||||
|
|
||||||
|
@ -1576,6 +1576,23 @@ SELECT * FROM t2;
|
|||||||
|
|
||||||
DROP TABLE t1,t2;
|
DROP TABLE t1,t2;
|
||||||
|
|
||||||
|
--echo #
|
||||||
|
--echo # Bug#29815: new option for suppressing last line of mysqldump:
|
||||||
|
--echo # "Dump completed on"
|
||||||
|
--echo #
|
||||||
|
|
||||||
|
--echo # --skip-dump-date:
|
||||||
|
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*//
|
||||||
|
--exec $MYSQL_DUMP --skip-dump-date test
|
||||||
|
|
||||||
|
--echo # --dump-date:
|
||||||
|
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
|
||||||
|
--exec $MYSQL_DUMP --dump-date test
|
||||||
|
|
||||||
|
--echo # --dump-date (default):
|
||||||
|
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
|
||||||
|
--exec $MYSQL_DUMP test
|
||||||
|
|
||||||
--echo #
|
--echo #
|
||||||
--echo # End of 5.0 tests
|
--echo # End of 5.0 tests
|
||||||
--echo #
|
--echo #
|
||||||
|
@ -358,3 +358,12 @@ SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) as t;
|
|||||||
|
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
--echo #
|
||||||
|
--echo # Bug#31095: Unexpected NULL constant caused server crash.
|
||||||
|
--echo #
|
||||||
|
create table t1(a int);
|
||||||
|
insert into t1 values (1),(2),(3);
|
||||||
|
select count(a) from t1 group by null with rollup;
|
||||||
|
drop table t1;
|
||||||
|
--echo ##############################################################
|
||||||
|
|
||||||
|
@ -3,6 +3,9 @@
|
|||||||
|
|
||||||
source include/master-slave.inc;
|
source include/master-slave.inc;
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
show variables like 'relay_log%';
|
||||||
|
|
||||||
connection slave;
|
connection slave;
|
||||||
stop slave;
|
stop slave;
|
||||||
--replace_result $MASTER_MYPORT MASTER_PORT
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
||||||
|
@ -136,3 +136,16 @@ insert into t1 values (9912101,9912101,9912101);
|
|||||||
insert into t1 values (11111,11111,11111);
|
insert into t1 values (11111,11111,11111);
|
||||||
select * from t1;
|
select * from t1;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #30942: select str_to_date from derived table returns varying results
|
||||||
|
#
|
||||||
|
CREATE TABLE t1 (
|
||||||
|
a INT
|
||||||
|
);
|
||||||
|
|
||||||
|
INSERT INTO t1 VALUES (1);
|
||||||
|
INSERT INTO t1 VALUES (NULL);
|
||||||
|
|
||||||
|
SELECT str_to_date( '', a ) FROM t1;
|
||||||
|
DROP TABLE t1;
|
||||||
|
@ -282,3 +282,41 @@ select * from t1 where f1 between 20020101 and 20070101000000;
|
|||||||
select * from t1 where f1 between 2002010 and 20070101000000;
|
select * from t1 where f1 between 2002010 and 20070101000000;
|
||||||
select * from t1 where f1 between 20020101 and 2007010100000;
|
select * from t1 where f1 between 20020101 and 2007010100000;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
|
--echo #
|
||||||
|
--echo # Bug#27216: functions with parameters of different date types may
|
||||||
|
--echo # return wrong type of the result.
|
||||||
|
--echo #
|
||||||
|
create table t1 (f1 date, f2 datetime, f3 varchar(20));
|
||||||
|
create table t2 as select coalesce(f1,f1) as f4 from t1;
|
||||||
|
desc t2;
|
||||||
|
create table t3 as select coalesce(f1,f2) as f4 from t1;
|
||||||
|
desc t3;
|
||||||
|
create table t4 as select coalesce(f2,f2) as f4 from t1;
|
||||||
|
desc t4;
|
||||||
|
create table t5 as select coalesce(f1,f3) as f4 from t1;
|
||||||
|
desc t5;
|
||||||
|
create table t6 as select coalesce(f2,f3) as f4 from t1;
|
||||||
|
desc t6;
|
||||||
|
create table t7 as select coalesce(makedate(1997,1),f2) as f4 from t1;
|
||||||
|
desc t7;
|
||||||
|
create table t8 as select coalesce(cast('01-01-01' as datetime),f2) as f4
|
||||||
|
from t1;
|
||||||
|
desc t8;
|
||||||
|
create table t9 as select case when 1 then cast('01-01-01' as date)
|
||||||
|
when 0 then cast('01-01-01' as date) end as f4 from t1;
|
||||||
|
desc t9;
|
||||||
|
create table t10 as select case when 1 then cast('01-01-01' as datetime)
|
||||||
|
when 0 then cast('01-01-01' as datetime) end as f4 from t1;
|
||||||
|
desc t10;
|
||||||
|
create table t11 as select if(1, cast('01-01-01' as datetime),
|
||||||
|
cast('01-01-01' as date)) as f4 from t1;
|
||||||
|
desc t11;
|
||||||
|
create table t12 as select least(cast('01-01-01' as datetime),
|
||||||
|
cast('01-01-01' as date)) as f4 from t1;
|
||||||
|
desc t12;
|
||||||
|
create table t13 as select ifnull(cast('01-01-01' as datetime),
|
||||||
|
cast('01-01-01' as date)) as f4 from t1;
|
||||||
|
desc t13;
|
||||||
|
drop tables t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13;
|
||||||
|
--echo ###################################################################
|
||||||
|
@ -510,7 +510,7 @@ drop table t1;
|
|||||||
#
|
#
|
||||||
create table t1 (a int, b int);
|
create table t1 (a int, b int);
|
||||||
create view v1 as select a, sum(b) from t1 group by a;
|
create view v1 as select a, sum(b) from t1 group by a;
|
||||||
-- error 1176
|
--error ER_WRONG_USAGE
|
||||||
select b from v1 use index (some_index) where b=1;
|
select b from v1 use index (some_index) where b=1;
|
||||||
drop view v1;
|
drop view v1;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
@ -2548,19 +2548,20 @@ CREATE TABLE t1(
|
|||||||
fName varchar(25) NOT NULL,
|
fName varchar(25) NOT NULL,
|
||||||
lName varchar(25) NOT NULL,
|
lName varchar(25) NOT NULL,
|
||||||
DOB date NOT NULL,
|
DOB date NOT NULL,
|
||||||
|
test_date date NOT NULL,
|
||||||
uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY);
|
uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY);
|
||||||
|
|
||||||
INSERT INTO t1(fName, lName, DOB) VALUES
|
INSERT INTO t1(fName, lName, DOB, test_date) VALUES
|
||||||
('Hank', 'Hill', '1964-09-29'),
|
('Hank', 'Hill', '1964-09-29', '2007-01-01'),
|
||||||
('Tom', 'Adams', '1908-02-14'),
|
('Tom', 'Adams', '1908-02-14', '2007-01-01'),
|
||||||
('Homer', 'Simpson', '1968-03-05');
|
('Homer', 'Simpson', '1968-03-05', '2007-01-01');
|
||||||
|
|
||||||
CREATE VIEW v1 AS
|
CREATE VIEW v1 AS
|
||||||
SELECT (year(now())-year(DOB)) AS Age
|
SELECT (year(test_date)-year(DOB)) AS Age
|
||||||
FROM t1 HAVING Age < 75;
|
FROM t1 HAVING Age < 75;
|
||||||
SHOW CREATE VIEW v1;
|
SHOW CREATE VIEW v1;
|
||||||
|
|
||||||
SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75;
|
SELECT (year(test_date)-year(DOB)) AS Age FROM t1 HAVING Age < 75;
|
||||||
SELECT * FROM v1;
|
SELECT * FROM v1;
|
||||||
|
|
||||||
DROP VIEW v1;
|
DROP VIEW v1;
|
||||||
@ -3415,5 +3416,45 @@ select table_name, is_updatable from information_schema.views
|
|||||||
drop view v1;
|
drop view v1;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #28701: SELECTs from VIEWs completely ignore USE/FORCE KEY, allowing
|
||||||
|
# invalid statements
|
||||||
|
#
|
||||||
|
|
||||||
|
CREATE TABLE t1 (a INT);
|
||||||
|
INSERT INTO t1 VALUES (1),(2);
|
||||||
|
CREATE VIEW v1 AS SELECT * FROM t1;
|
||||||
|
--error ER_WRONG_USAGE
|
||||||
|
SELECT * FROM v1 USE KEY(non_existant);
|
||||||
|
--error ER_WRONG_USAGE
|
||||||
|
SELECT * FROM v1 FORCE KEY(non_existant);
|
||||||
|
--error ER_WRONG_USAGE
|
||||||
|
SELECT * FROM v1 IGNORE KEY(non_existant);
|
||||||
|
|
||||||
|
DROP VIEW v1;
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #28702: VIEWs defined with USE/FORCE KEY ignore that request
|
||||||
|
#
|
||||||
|
CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b INT NOT NULL DEFAULT 0,
|
||||||
|
PRIMARY KEY(a), KEY (b));
|
||||||
|
INSERT INTO t1 VALUES (),(),(),(),(),(),(),(),(),(),(),(),(),(),();
|
||||||
|
CREATE VIEW v1 AS SELECT * FROM t1 FORCE KEY (PRIMARY,b) ORDER BY a;
|
||||||
|
SHOW CREATE VIEW v1;
|
||||||
|
EXPLAIN SELECT * FROM v1;
|
||||||
|
CREATE VIEW v2 AS SELECT * FROM t1 USE KEY () ORDER BY a;
|
||||||
|
SHOW CREATE VIEW v2;
|
||||||
|
EXPLAIN SELECT * FROM v2;
|
||||||
|
CREATE VIEW v3 AS SELECT * FROM t1 IGNORE KEY (b) ORDER BY a;
|
||||||
|
SHOW CREATE VIEW v3;
|
||||||
|
EXPLAIN SELECT * FROM v3;
|
||||||
|
|
||||||
|
DROP VIEW v1;
|
||||||
|
DROP VIEW v2;
|
||||||
|
DROP VIEW v3;
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
--echo End of 5.0 tests.
|
--echo End of 5.0 tests.
|
||||||
|
|
||||||
|
@ -1034,10 +1034,11 @@ GRANT SELECT ON db26813.t1 TO u26813@localhost;
|
|||||||
|
|
||||||
connect (u1,localhost,u26813,,db26813);
|
connect (u1,localhost,u26813,,db26813);
|
||||||
connection u1;
|
connection u1;
|
||||||
--error 1142
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
||||||
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
||||||
--error 1142
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
||||||
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
||||||
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
||||||
ALTER VIEW v3 AS SELECT f2 FROM t1;
|
ALTER VIEW v3 AS SELECT f2 FROM t1;
|
||||||
|
|
||||||
connection root;
|
connection root;
|
||||||
@ -1047,6 +1048,51 @@ DROP USER u26813@localhost;
|
|||||||
DROP DATABASE db26813;
|
DROP DATABASE db26813;
|
||||||
disconnect u1;
|
disconnect u1;
|
||||||
|
|
||||||
|
--echo #
|
||||||
|
--echo # Bug#29908: A user can gain additional access through the ALTER VIEW.
|
||||||
|
--echo #
|
||||||
|
connection root;
|
||||||
|
CREATE DATABASE mysqltest_29908;
|
||||||
|
USE mysqltest_29908;
|
||||||
|
CREATE TABLE t1(f1 INT, f2 INT);
|
||||||
|
CREATE USER u29908_1@localhost;
|
||||||
|
CREATE DEFINER = u29908_1@localhost VIEW v1 AS SELECT f1 FROM t1;
|
||||||
|
CREATE DEFINER = u29908_1@localhost SQL SECURITY INVOKER VIEW v2 AS
|
||||||
|
SELECT f1 FROM t1;
|
||||||
|
GRANT DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v1 TO u29908_1@localhost;
|
||||||
|
GRANT DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v2 TO u29908_1@localhost;
|
||||||
|
GRANT SELECT ON mysqltest_29908.t1 TO u29908_1@localhost;
|
||||||
|
CREATE USER u29908_2@localhost;
|
||||||
|
GRANT DROP, CREATE VIEW ON mysqltest_29908.v1 TO u29908_2@localhost;
|
||||||
|
GRANT DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v2 TO u29908_2@localhost;
|
||||||
|
GRANT SELECT ON mysqltest_29908.t1 TO u29908_2@localhost;
|
||||||
|
|
||||||
|
connect (u2,localhost,u29908_2,,mysqltest_29908);
|
||||||
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
||||||
|
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
||||||
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
||||||
|
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
||||||
|
SHOW CREATE VIEW v2;
|
||||||
|
|
||||||
|
connect (u1,localhost,u29908_1,,mysqltest_29908);
|
||||||
|
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
||||||
|
SHOW CREATE VIEW v1;
|
||||||
|
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
||||||
|
SHOW CREATE VIEW v2;
|
||||||
|
|
||||||
|
connection root;
|
||||||
|
ALTER VIEW v1 AS SELECT f1 FROM t1;
|
||||||
|
SHOW CREATE VIEW v1;
|
||||||
|
ALTER VIEW v2 AS SELECT f1 FROM t1;
|
||||||
|
SHOW CREATE VIEW v2;
|
||||||
|
|
||||||
|
DROP USER u29908_1@localhost;
|
||||||
|
DROP USER u29908_2@localhost;
|
||||||
|
DROP DATABASE mysqltest_29908;
|
||||||
|
disconnect u1;
|
||||||
|
disconnect u2;
|
||||||
|
--echo #######################################################################
|
||||||
|
|
||||||
#
|
#
|
||||||
# BUG#24040: Create View don't succed with "all privileges" on a database.
|
# BUG#24040: Create View don't succed with "all privileges" on a database.
|
||||||
#
|
#
|
||||||
|
16
sql/field.cc
16
sql/field.cc
@ -1356,15 +1356,25 @@ void Field_num::add_zerofill_and_unsigned(String &res) const
|
|||||||
|
|
||||||
void Field::make_field(Send_field *field)
|
void Field::make_field(Send_field *field)
|
||||||
{
|
{
|
||||||
if (orig_table->s->table_cache_key && *(orig_table->s->table_cache_key))
|
if (orig_table && orig_table->s->table_cache_key &&
|
||||||
|
*(orig_table->s->table_cache_key))
|
||||||
{
|
{
|
||||||
field->org_table_name= orig_table->s->table_name;
|
field->org_table_name= orig_table->s->table_name;
|
||||||
field->db_name= orig_table->s->table_cache_key;
|
field->db_name= orig_table->s->table_cache_key;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
field->org_table_name= field->db_name= "";
|
field->org_table_name= field->db_name= "";
|
||||||
field->table_name= orig_table->alias;
|
if (orig_table)
|
||||||
field->col_name= field->org_col_name= field_name;
|
{
|
||||||
|
field->table_name= orig_table->alias;
|
||||||
|
field->org_col_name= field_name;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
field->table_name= "";
|
||||||
|
field->org_col_name= "";
|
||||||
|
}
|
||||||
|
field->col_name= field_name;
|
||||||
field->charsetnr= charset()->number;
|
field->charsetnr= charset()->number;
|
||||||
field->length=field_length;
|
field->length=field_length;
|
||||||
field->type=type();
|
field->type=type();
|
||||||
|
@ -44,7 +44,7 @@ bool Gis_read_stream::get_next_word(LEX_STRING *res)
|
|||||||
skip_space();
|
skip_space();
|
||||||
res->str= (char*) m_cur;
|
res->str= (char*) m_cur;
|
||||||
/* The following will also test for \0 */
|
/* The following will also test for \0 */
|
||||||
if (!my_isvar_start(&my_charset_bin, *m_cur))
|
if ((m_cur >= m_limit) || !my_isvar_start(&my_charset_bin, *m_cur))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1112,6 +1112,8 @@ public:
|
|||||||
Item_name_const(Item *name_arg, Item *val):
|
Item_name_const(Item *name_arg, Item *val):
|
||||||
value_item(val), name_item(name_arg)
|
value_item(val), name_item(name_arg)
|
||||||
{
|
{
|
||||||
|
if(!value_item->basic_const_item())
|
||||||
|
my_error(ER_WRONG_ARGUMENTS, MYF(0), "NAME_CONST");
|
||||||
Item::maybe_null= TRUE;
|
Item::maybe_null= TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,6 +147,36 @@ static int agg_cmp_type(THD *thd, Item_result *type, Item **items, uint nitems)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
@brief Aggregates field types from the array of items.
|
||||||
|
|
||||||
|
@param[in] items array of items to aggregate the type from
|
||||||
|
@paran[in] nitems number of items in the array
|
||||||
|
|
||||||
|
@details This function aggregates field types from the array of items.
|
||||||
|
Found type is supposed to be used later as the result field type
|
||||||
|
of a multi-argument function.
|
||||||
|
Aggregation itself is performed by the Field::field_type_merge()
|
||||||
|
function.
|
||||||
|
|
||||||
|
@note The term "aggregation" is used here in the sense of inferring the
|
||||||
|
result type of a function from its argument types.
|
||||||
|
|
||||||
|
@return aggregated field type.
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum_field_types agg_field_type(Item **items, uint nitems)
|
||||||
|
{
|
||||||
|
uint i;
|
||||||
|
if (!nitems || items[0]->result_type() == ROW_RESULT )
|
||||||
|
return (enum_field_types)-1;
|
||||||
|
enum_field_types res= items[0]->field_type();
|
||||||
|
for (i= 1 ; i < nitems ; i++)
|
||||||
|
res= Field::field_type_merge(res, items[i]->field_type());
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static void my_coll_agg_error(DTCollation &c1, DTCollation &c2,
|
static void my_coll_agg_error(DTCollation &c1, DTCollation &c2,
|
||||||
const char *fname)
|
const char *fname)
|
||||||
{
|
{
|
||||||
@ -2009,9 +2039,7 @@ Item_func_ifnull::fix_length_and_dec()
|
|||||||
default:
|
default:
|
||||||
DBUG_ASSERT(0);
|
DBUG_ASSERT(0);
|
||||||
}
|
}
|
||||||
cached_field_type= args[0]->field_type();
|
cached_field_type= agg_field_type(args, 2);
|
||||||
if (cached_field_type != args[1]->field_type())
|
|
||||||
cached_field_type= Item_func::field_type();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -2159,11 +2187,13 @@ Item_func_if::fix_length_and_dec()
|
|||||||
{
|
{
|
||||||
cached_result_type= arg2_type;
|
cached_result_type= arg2_type;
|
||||||
collation.set(args[2]->collation.collation);
|
collation.set(args[2]->collation.collation);
|
||||||
|
cached_field_type= args[2]->field_type();
|
||||||
}
|
}
|
||||||
else if (null2)
|
else if (null2)
|
||||||
{
|
{
|
||||||
cached_result_type= arg1_type;
|
cached_result_type= arg1_type;
|
||||||
collation.set(args[1]->collation.collation);
|
collation.set(args[1]->collation.collation);
|
||||||
|
cached_field_type= args[1]->field_type();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -2177,6 +2207,7 @@ Item_func_if::fix_length_and_dec()
|
|||||||
{
|
{
|
||||||
collation.set(&my_charset_bin); // Number
|
collation.set(&my_charset_bin); // Number
|
||||||
}
|
}
|
||||||
|
cached_field_type= agg_field_type(args + 1, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((cached_result_type == DECIMAL_RESULT )
|
if ((cached_result_type == DECIMAL_RESULT )
|
||||||
@ -2556,7 +2587,7 @@ void Item_func_case::fix_length_and_dec()
|
|||||||
agg_arg_charsets(collation, agg, nagg, MY_COLL_ALLOW_CONV, 1))
|
agg_arg_charsets(collation, agg, nagg, MY_COLL_ALLOW_CONV, 1))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
cached_field_type= agg_field_type(agg, nagg);
|
||||||
/*
|
/*
|
||||||
Aggregate first expression and all THEN expression types
|
Aggregate first expression and all THEN expression types
|
||||||
and collations when string comparison
|
and collations when string comparison
|
||||||
@ -2695,6 +2726,7 @@ my_decimal *Item_func_coalesce::decimal_op(my_decimal *decimal_value)
|
|||||||
|
|
||||||
void Item_func_coalesce::fix_length_and_dec()
|
void Item_func_coalesce::fix_length_and_dec()
|
||||||
{
|
{
|
||||||
|
cached_field_type= agg_field_type(args, arg_count);
|
||||||
agg_result_type(&hybrid_type, args, arg_count);
|
agg_result_type(&hybrid_type, args, arg_count);
|
||||||
switch (hybrid_type) {
|
switch (hybrid_type) {
|
||||||
case STRING_RESULT:
|
case STRING_RESULT:
|
||||||
|
@ -640,6 +640,7 @@ public:
|
|||||||
class Item_func_coalesce :public Item_func_numhybrid
|
class Item_func_coalesce :public Item_func_numhybrid
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
|
enum_field_types cached_field_type;
|
||||||
Item_func_coalesce(Item *a, Item *b) :Item_func_numhybrid(a, b) {}
|
Item_func_coalesce(Item *a, Item *b) :Item_func_numhybrid(a, b) {}
|
||||||
public:
|
public:
|
||||||
Item_func_coalesce(List<Item> &list) :Item_func_numhybrid(list) {}
|
Item_func_coalesce(List<Item> &list) :Item_func_numhybrid(list) {}
|
||||||
@ -652,13 +653,13 @@ public:
|
|||||||
enum Item_result result_type () const { return hybrid_type; }
|
enum Item_result result_type () const { return hybrid_type; }
|
||||||
const char *func_name() const { return "coalesce"; }
|
const char *func_name() const { return "coalesce"; }
|
||||||
table_map not_null_tables() const { return 0; }
|
table_map not_null_tables() const { return 0; }
|
||||||
|
enum_field_types field_type() const { return cached_field_type; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
class Item_func_ifnull :public Item_func_coalesce
|
class Item_func_ifnull :public Item_func_coalesce
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
enum_field_types cached_field_type;
|
|
||||||
bool field_type_defined;
|
bool field_type_defined;
|
||||||
public:
|
public:
|
||||||
Item_func_ifnull(Item *a, Item *b) :Item_func_coalesce(a,b) {}
|
Item_func_ifnull(Item *a, Item *b) :Item_func_coalesce(a,b) {}
|
||||||
@ -677,6 +678,7 @@ public:
|
|||||||
class Item_func_if :public Item_func
|
class Item_func_if :public Item_func
|
||||||
{
|
{
|
||||||
enum Item_result cached_result_type;
|
enum Item_result cached_result_type;
|
||||||
|
enum_field_types cached_field_type;
|
||||||
public:
|
public:
|
||||||
Item_func_if(Item *a,Item *b,Item *c)
|
Item_func_if(Item *a,Item *b,Item *c)
|
||||||
:Item_func(a,b,c), cached_result_type(INT_RESULT)
|
:Item_func(a,b,c), cached_result_type(INT_RESULT)
|
||||||
@ -686,6 +688,7 @@ public:
|
|||||||
String *val_str(String *str);
|
String *val_str(String *str);
|
||||||
my_decimal *val_decimal(my_decimal *);
|
my_decimal *val_decimal(my_decimal *);
|
||||||
enum Item_result result_type () const { return cached_result_type; }
|
enum Item_result result_type () const { return cached_result_type; }
|
||||||
|
enum_field_types field_type() const { return cached_field_type; }
|
||||||
bool fix_fields(THD *, Item **);
|
bool fix_fields(THD *, Item **);
|
||||||
void fix_length_and_dec();
|
void fix_length_and_dec();
|
||||||
uint decimal_precision() const;
|
uint decimal_precision() const;
|
||||||
@ -722,6 +725,7 @@ class Item_func_case :public Item_func
|
|||||||
uint ncases;
|
uint ncases;
|
||||||
Item_result cmp_type;
|
Item_result cmp_type;
|
||||||
DTCollation cmp_collation;
|
DTCollation cmp_collation;
|
||||||
|
enum_field_types cached_field_type;
|
||||||
public:
|
public:
|
||||||
Item_func_case(List<Item> &list, Item *first_expr_arg, Item *else_expr_arg)
|
Item_func_case(List<Item> &list, Item *first_expr_arg, Item *else_expr_arg)
|
||||||
:Item_func(), first_expr_num(-1), else_expr_num(-1),
|
:Item_func(), first_expr_num(-1), else_expr_num(-1),
|
||||||
@ -749,6 +753,7 @@ public:
|
|||||||
uint decimal_precision() const;
|
uint decimal_precision() const;
|
||||||
table_map not_null_tables() const { return 0; }
|
table_map not_null_tables() const { return 0; }
|
||||||
enum Item_result result_type () const { return cached_result_type; }
|
enum Item_result result_type () const { return cached_result_type; }
|
||||||
|
enum_field_types field_type() const { return cached_field_type; }
|
||||||
const char *func_name() const { return "case"; }
|
const char *func_name() const { return "case"; }
|
||||||
void print(String *str);
|
void print(String *str);
|
||||||
Item *find_item(String *str);
|
Item *find_item(String *str);
|
||||||
@ -1382,6 +1387,7 @@ public:
|
|||||||
bool subst_argument_checker(byte **arg) { return TRUE; }
|
bool subst_argument_checker(byte **arg) { return TRUE; }
|
||||||
Item *compile(Item_analyzer analyzer, byte **arg_p,
|
Item *compile(Item_analyzer analyzer, byte **arg_p,
|
||||||
Item_transformer transformer, byte *arg_t);
|
Item_transformer transformer, byte *arg_t);
|
||||||
|
enum_field_types field_type() const { return MYSQL_TYPE_LONGLONG; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -1380,7 +1380,11 @@ longlong Item_func_int_div::val_int()
|
|||||||
|
|
||||||
void Item_func_int_div::fix_length_and_dec()
|
void Item_func_int_div::fix_length_and_dec()
|
||||||
{
|
{
|
||||||
max_length=args[0]->max_length - args[0]->decimals;
|
Item_result argtype= args[0]->result_type();
|
||||||
|
/* use precision ony for the data type it is applicable for and valid */
|
||||||
|
max_length=args[0]->max_length -
|
||||||
|
(argtype == DECIMAL_RESULT || argtype == INT_RESULT ?
|
||||||
|
args[0]->decimals : 0);
|
||||||
maybe_null=1;
|
maybe_null=1;
|
||||||
unsigned_flag=args[0]->unsigned_flag | args[1]->unsigned_flag;
|
unsigned_flag=args[0]->unsigned_flag | args[1]->unsigned_flag;
|
||||||
}
|
}
|
||||||
@ -2243,6 +2247,7 @@ void Item_func_min_max::fix_length_and_dec()
|
|||||||
else if ((cmp_type == DECIMAL_RESULT) || (cmp_type == INT_RESULT))
|
else if ((cmp_type == DECIMAL_RESULT) || (cmp_type == INT_RESULT))
|
||||||
max_length= my_decimal_precision_to_length(max_int_part+decimals, decimals,
|
max_length= my_decimal_precision_to_length(max_int_part+decimals, decimals,
|
||||||
unsigned_flag);
|
unsigned_flag);
|
||||||
|
cached_field_type= agg_field_type(args, arg_count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -435,6 +435,7 @@ public:
|
|||||||
longlong int_op();
|
longlong int_op();
|
||||||
my_decimal *decimal_op(my_decimal *);
|
my_decimal *decimal_op(my_decimal *);
|
||||||
const char *func_name() const { return "-"; }
|
const char *func_name() const { return "-"; }
|
||||||
|
virtual bool basic_const_item() const { return args[0]->basic_const_item(); }
|
||||||
void fix_length_and_dec();
|
void fix_length_and_dec();
|
||||||
void fix_num_length_and_dec();
|
void fix_num_length_and_dec();
|
||||||
uint decimal_precision() const { return args[0]->decimal_precision(); }
|
uint decimal_precision() const { return args[0]->decimal_precision(); }
|
||||||
@ -692,7 +693,8 @@ class Item_func_min_max :public Item_func
|
|||||||
/* An item used for issuing warnings while string to DATETIME conversion. */
|
/* An item used for issuing warnings while string to DATETIME conversion. */
|
||||||
Item *datetime_item;
|
Item *datetime_item;
|
||||||
THD *thd;
|
THD *thd;
|
||||||
|
protected:
|
||||||
|
enum_field_types cached_field_type;
|
||||||
public:
|
public:
|
||||||
Item_func_min_max(List<Item> &list,int cmp_sign_arg) :Item_func(list),
|
Item_func_min_max(List<Item> &list,int cmp_sign_arg) :Item_func(list),
|
||||||
cmp_type(INT_RESULT), cmp_sign(cmp_sign_arg), compare_as_dates(FALSE),
|
cmp_type(INT_RESULT), cmp_sign(cmp_sign_arg), compare_as_dates(FALSE),
|
||||||
@ -705,6 +707,7 @@ public:
|
|||||||
enum Item_result result_type () const { return cmp_type; }
|
enum Item_result result_type () const { return cmp_type; }
|
||||||
bool result_as_longlong() { return compare_as_dates; };
|
bool result_as_longlong() { return compare_as_dates; };
|
||||||
uint cmp_datetimes(ulonglong *value);
|
uint cmp_datetimes(ulonglong *value);
|
||||||
|
enum_field_types field_type() const { return cached_field_type; }
|
||||||
};
|
};
|
||||||
|
|
||||||
class Item_func_min :public Item_func_min_max
|
class Item_func_min :public Item_func_min_max
|
||||||
@ -747,6 +750,8 @@ public:
|
|||||||
collation= args[0]->collation;
|
collation= args[0]->collation;
|
||||||
max_length= args[0]->max_length;
|
max_length= args[0]->max_length;
|
||||||
decimals=args[0]->decimals;
|
decimals=args[0]->decimals;
|
||||||
|
/* The item could be a NULL constant. */
|
||||||
|
null_value= args[0]->null_value;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -3310,7 +3310,7 @@ void Item_func_str_to_date::fix_length_and_dec()
|
|||||||
String format_str(format_buff, sizeof(format_buff), &my_charset_bin), *format;
|
String format_str(format_buff, sizeof(format_buff), &my_charset_bin), *format;
|
||||||
maybe_null= 1;
|
maybe_null= 1;
|
||||||
decimals=0;
|
decimals=0;
|
||||||
cached_field_type= MYSQL_TYPE_STRING;
|
cached_field_type= MYSQL_TYPE_DATETIME;
|
||||||
max_length= MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN;
|
max_length= MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN;
|
||||||
cached_timestamp_type= MYSQL_TIMESTAMP_NONE;
|
cached_timestamp_type= MYSQL_TIMESTAMP_NONE;
|
||||||
format= args[1]->val_str(&format_str);
|
format= args[1]->val_str(&format_str);
|
||||||
|
@ -962,7 +962,10 @@ class Item_func_maketime :public Item_str_timefunc
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Item_func_maketime(Item *a, Item *b, Item *c)
|
Item_func_maketime(Item *a, Item *b, Item *c)
|
||||||
:Item_str_timefunc(a, b ,c) {}
|
:Item_str_timefunc(a, b, c)
|
||||||
|
{
|
||||||
|
maybe_null= TRUE;
|
||||||
|
}
|
||||||
String *val_str(String *str);
|
String *val_str(String *str);
|
||||||
const char *func_name() const { return "maketime"; }
|
const char *func_name() const { return "maketime"; }
|
||||||
};
|
};
|
||||||
@ -1030,7 +1033,7 @@ class Item_func_str_to_date :public Item_str_func
|
|||||||
bool const_item;
|
bool const_item;
|
||||||
public:
|
public:
|
||||||
Item_func_str_to_date(Item *a, Item *b)
|
Item_func_str_to_date(Item *a, Item *b)
|
||||||
:Item_str_func(a, b)
|
:Item_str_func(a, b), const_item(false)
|
||||||
{}
|
{}
|
||||||
String *val_str(String *str);
|
String *val_str(String *str);
|
||||||
bool get_date(MYSQL_TIME *ltime, uint fuzzy_date);
|
bool get_date(MYSQL_TIME *ltime, uint fuzzy_date);
|
||||||
|
@ -1220,6 +1220,7 @@ my_bool mysql_rm_tmp_tables(void);
|
|||||||
|
|
||||||
/* item_func.cc */
|
/* item_func.cc */
|
||||||
extern bool check_reserved_words(LEX_STRING *name);
|
extern bool check_reserved_words(LEX_STRING *name);
|
||||||
|
extern enum_field_types agg_field_type(Item **items, uint nitems);
|
||||||
|
|
||||||
/* strfunc.cc */
|
/* strfunc.cc */
|
||||||
ulonglong find_set(TYPELIB *lib, const char *x, uint length, CHARSET_INFO *cs,
|
ulonglong find_set(TYPELIB *lib, const char *x, uint length, CHARSET_INFO *cs,
|
||||||
|
@ -824,6 +824,7 @@ bool Protocol_simple::store(const char *from, uint length,
|
|||||||
field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
|
field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
|
||||||
field_types[field_pos] == MYSQL_TYPE_BIT ||
|
field_types[field_pos] == MYSQL_TYPE_BIT ||
|
||||||
field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
|
field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
|
||||||
|
field_types[field_pos] == MYSQL_TYPE_NEWDATE ||
|
||||||
(field_types[field_pos] >= MYSQL_TYPE_ENUM &&
|
(field_types[field_pos] >= MYSQL_TYPE_ENUM &&
|
||||||
field_types[field_pos] <= MYSQL_TYPE_GEOMETRY));
|
field_types[field_pos] <= MYSQL_TYPE_GEOMETRY));
|
||||||
field_pos++;
|
field_pos++;
|
||||||
|
@ -1040,6 +1040,9 @@ struct show_var_st init_vars[]= {
|
|||||||
{sys_readonly.name, (char*) &sys_readonly, SHOW_SYS},
|
{sys_readonly.name, (char*) &sys_readonly, SHOW_SYS},
|
||||||
{sys_read_rnd_buff_size.name,(char*) &sys_read_rnd_buff_size, SHOW_SYS},
|
{sys_read_rnd_buff_size.name,(char*) &sys_read_rnd_buff_size, SHOW_SYS},
|
||||||
#ifdef HAVE_REPLICATION
|
#ifdef HAVE_REPLICATION
|
||||||
|
{"relay_log" , (char*) &opt_relay_logname, SHOW_CHAR_PTR},
|
||||||
|
{"relay_log_index", (char*) &opt_relaylog_index_name, SHOW_CHAR_PTR},
|
||||||
|
{"relay_log_info_file", (char*) &relay_log_info_file, SHOW_CHAR_PTR},
|
||||||
{sys_relay_log_purge.name, (char*) &sys_relay_log_purge, SHOW_SYS},
|
{sys_relay_log_purge.name, (char*) &sys_relay_log_purge, SHOW_SYS},
|
||||||
{"relay_log_space_limit", (char*) &relay_log_space_limit, SHOW_LONGLONG},
|
{"relay_log_space_limit", (char*) &relay_log_space_limit, SHOW_LONGLONG},
|
||||||
#endif
|
#endif
|
||||||
|
107
sql/sql_acl.cc
107
sql/sql_acl.cc
@ -3835,50 +3835,83 @@ bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool check_grant_all_columns(THD *thd, ulong want_access, GRANT_INFO *grant,
|
/**
|
||||||
const char* db_name, const char *table_name,
|
@brief check if a query can access a set of columns
|
||||||
Field_iterator *fields)
|
|
||||||
|
@param thd the current thread
|
||||||
|
@param want_access_arg the privileges requested
|
||||||
|
@param fields an iterator over the fields of a table reference.
|
||||||
|
@return Operation status
|
||||||
|
@retval 0 Success
|
||||||
|
@retval 1 Falure
|
||||||
|
@details This function walks over the columns of a table reference
|
||||||
|
The columns may originate from different tables, depending on the kind of
|
||||||
|
table reference, e.g. join.
|
||||||
|
For each table it will retrieve the grant information and will use it
|
||||||
|
to check the required access privileges for the fields requested from it.
|
||||||
|
*/
|
||||||
|
bool check_grant_all_columns(THD *thd, ulong want_access_arg,
|
||||||
|
Field_iterator_table_ref *fields)
|
||||||
{
|
{
|
||||||
Security_context *sctx= thd->security_ctx;
|
Security_context *sctx= thd->security_ctx;
|
||||||
GRANT_TABLE *grant_table;
|
ulong want_access= want_access_arg;
|
||||||
GRANT_COLUMN *grant_column;
|
const char *table_name= NULL;
|
||||||
|
|
||||||
want_access &= ~grant->privilege;
|
if (grant_option)
|
||||||
if (!want_access)
|
|
||||||
return 0; // Already checked
|
|
||||||
if (!grant_option)
|
|
||||||
goto err2;
|
|
||||||
|
|
||||||
rw_rdlock(&LOCK_grant);
|
|
||||||
|
|
||||||
/* reload table if someone has modified any grants */
|
|
||||||
|
|
||||||
if (grant->version != grant_version)
|
|
||||||
{
|
{
|
||||||
grant->grant_table=
|
const char* db_name;
|
||||||
table_hash_search(sctx->host, sctx->ip, db_name,
|
GRANT_INFO *grant;
|
||||||
sctx->priv_user,
|
/* Initialized only to make gcc happy */
|
||||||
table_name, 0); /* purecov: inspected */
|
GRANT_TABLE *grant_table= NULL;
|
||||||
grant->version= grant_version; /* purecov: inspected */
|
|
||||||
}
|
|
||||||
/* The following should always be true */
|
|
||||||
if (!(grant_table= grant->grant_table))
|
|
||||||
goto err; /* purecov: inspected */
|
|
||||||
|
|
||||||
for (; !fields->end_of_fields(); fields->next())
|
rw_rdlock(&LOCK_grant);
|
||||||
{
|
|
||||||
const char *field_name= fields->name();
|
for (; !fields->end_of_fields(); fields->next())
|
||||||
grant_column= column_hash_search(grant_table, field_name,
|
{
|
||||||
(uint) strlen(field_name));
|
const char *field_name= fields->name();
|
||||||
if (!grant_column || (~grant_column->rights & want_access))
|
|
||||||
goto err;
|
if (table_name != fields->table_name())
|
||||||
}
|
{
|
||||||
rw_unlock(&LOCK_grant);
|
table_name= fields->table_name();
|
||||||
return 0;
|
db_name= fields->db_name();
|
||||||
|
grant= fields->grant();
|
||||||
|
/* get a fresh one for each table */
|
||||||
|
want_access= want_access_arg & ~grant->privilege;
|
||||||
|
if (want_access)
|
||||||
|
{
|
||||||
|
/* reload table if someone has modified any grants */
|
||||||
|
if (grant->version != grant_version)
|
||||||
|
{
|
||||||
|
grant->grant_table=
|
||||||
|
table_hash_search(sctx->host, sctx->ip, db_name,
|
||||||
|
sctx->priv_user,
|
||||||
|
table_name, 0); /* purecov: inspected */
|
||||||
|
grant->version= grant_version; /* purecov: inspected */
|
||||||
|
}
|
||||||
|
|
||||||
|
grant_table= grant->grant_table;
|
||||||
|
DBUG_ASSERT (grant_table);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (want_access)
|
||||||
|
{
|
||||||
|
GRANT_COLUMN *grant_column=
|
||||||
|
column_hash_search(grant_table, field_name,
|
||||||
|
(uint) strlen(field_name));
|
||||||
|
if (!grant_column || (~grant_column->rights & want_access))
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rw_unlock(&LOCK_grant);
|
||||||
|
return 0;
|
||||||
|
|
||||||
err:
|
err:
|
||||||
rw_unlock(&LOCK_grant);
|
rw_unlock(&LOCK_grant);
|
||||||
err2:
|
}
|
||||||
|
else
|
||||||
|
table_name= fields->table_name();
|
||||||
|
|
||||||
char command[128];
|
char command[128];
|
||||||
get_privilege_desc(command, sizeof(command), want_access);
|
get_privilege_desc(command, sizeof(command), want_access);
|
||||||
my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0),
|
my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0),
|
||||||
|
@ -205,9 +205,8 @@ bool check_grant_column (THD *thd, GRANT_INFO *grant,
|
|||||||
const char *name, uint length, Security_context *sctx);
|
const char *name, uint length, Security_context *sctx);
|
||||||
bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref,
|
bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref,
|
||||||
const char *name, uint length);
|
const char *name, uint length);
|
||||||
bool check_grant_all_columns(THD *thd, ulong want_access, GRANT_INFO *grant,
|
bool check_grant_all_columns(THD *thd, ulong want_access,
|
||||||
const char* db_name, const char *table_name,
|
Field_iterator_table_ref *fields);
|
||||||
Field_iterator *fields);
|
|
||||||
bool check_grant_routine(THD *thd, ulong want_access,
|
bool check_grant_routine(THD *thd, ulong want_access,
|
||||||
TABLE_LIST *procs, bool is_proc, bool no_error);
|
TABLE_LIST *procs, bool is_proc, bool no_error);
|
||||||
bool check_grant_db(THD *thd,const char *db);
|
bool check_grant_db(THD *thd,const char *db);
|
||||||
|
@ -5414,10 +5414,7 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
|
|||||||
!any_privileges)
|
!any_privileges)
|
||||||
{
|
{
|
||||||
field_iterator.set(tables);
|
field_iterator.set(tables);
|
||||||
if (check_grant_all_columns(thd, SELECT_ACL, field_iterator.grant(),
|
if (check_grant_all_columns(thd, SELECT_ACL, &field_iterator))
|
||||||
field_iterator.db_name(),
|
|
||||||
field_iterator.table_name(),
|
|
||||||
&field_iterator))
|
|
||||||
DBUG_RETURN(TRUE);
|
DBUG_RETURN(TRUE);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -2029,7 +2029,7 @@ class select_insert :public select_result_interceptor {
|
|||||||
ulonglong last_insert_id;
|
ulonglong last_insert_id;
|
||||||
COPY_INFO info;
|
COPY_INFO info;
|
||||||
bool insert_into_view;
|
bool insert_into_view;
|
||||||
|
bool is_bulk_insert_mode;
|
||||||
select_insert(TABLE_LIST *table_list_par,
|
select_insert(TABLE_LIST *table_list_par,
|
||||||
TABLE *table_par, List<Item> *fields_par,
|
TABLE *table_par, List<Item> *fields_par,
|
||||||
List<Item> *update_fields, List<Item> *update_values,
|
List<Item> *update_fields, List<Item> *update_values,
|
||||||
|
@ -189,11 +189,9 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list,
|
|||||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||||
if (grant_option)
|
if (grant_option)
|
||||||
{
|
{
|
||||||
Field_iterator_table field_it;
|
Field_iterator_table_ref field_it;
|
||||||
field_it.set_table(table);
|
field_it.set(table_list);
|
||||||
if (check_grant_all_columns(thd, INSERT_ACL, &table->grant,
|
if (check_grant_all_columns(thd, INSERT_ACL, &field_it))
|
||||||
table->s->db, table->s->table_name,
|
|
||||||
&field_it))
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -2647,7 +2645,8 @@ select_insert::select_insert(TABLE_LIST *table_list_par, TABLE *table_par,
|
|||||||
bool ignore_check_option_errors)
|
bool ignore_check_option_errors)
|
||||||
:table_list(table_list_par), table(table_par), fields(fields_par),
|
:table_list(table_list_par), table(table_par), fields(fields_par),
|
||||||
last_insert_id(0),
|
last_insert_id(0),
|
||||||
insert_into_view(table_list_par && table_list_par->view != 0)
|
insert_into_view(table_list_par && table_list_par->view != 0),
|
||||||
|
is_bulk_insert_mode(FALSE)
|
||||||
{
|
{
|
||||||
bzero((char*) &info,sizeof(info));
|
bzero((char*) &info,sizeof(info));
|
||||||
info.handle_duplicates= duplic;
|
info.handle_duplicates= duplic;
|
||||||
@ -2832,8 +2831,11 @@ int select_insert::prepare2(void)
|
|||||||
{
|
{
|
||||||
DBUG_ENTER("select_insert::prepare2");
|
DBUG_ENTER("select_insert::prepare2");
|
||||||
if (thd->lex->current_select->options & OPTION_BUFFER_RESULT &&
|
if (thd->lex->current_select->options & OPTION_BUFFER_RESULT &&
|
||||||
!thd->prelocked_mode)
|
!thd->prelocked_mode && !is_bulk_insert_mode)
|
||||||
|
{
|
||||||
table->file->start_bulk_insert((ha_rows) 0);
|
table->file->start_bulk_insert((ha_rows) 0);
|
||||||
|
is_bulk_insert_mode= TRUE;
|
||||||
|
}
|
||||||
DBUG_RETURN(0);
|
DBUG_RETURN(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2939,6 +2941,7 @@ bool select_insert::send_eof()
|
|||||||
DBUG_ENTER("select_insert::send_eof");
|
DBUG_ENTER("select_insert::send_eof");
|
||||||
|
|
||||||
error= (!thd->prelocked_mode) ? table->file->end_bulk_insert():0;
|
error= (!thd->prelocked_mode) ? table->file->end_bulk_insert():0;
|
||||||
|
is_bulk_insert_mode= FALSE;
|
||||||
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
|
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
|
||||||
table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
|
table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
|
||||||
|
|
||||||
@ -3129,7 +3132,10 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
|
|||||||
create_field *cr_field;
|
create_field *cr_field;
|
||||||
Field *field, *def_field;
|
Field *field, *def_field;
|
||||||
if (item->type() == Item::FUNC_ITEM)
|
if (item->type() == Item::FUNC_ITEM)
|
||||||
field= item->tmp_table_field(&tmp_table);
|
if (item->result_type() != STRING_RESULT)
|
||||||
|
field= item->tmp_table_field(&tmp_table);
|
||||||
|
else
|
||||||
|
field= item->tmp_table_field_from_field_type(&tmp_table);
|
||||||
else
|
else
|
||||||
field= create_tmp_field(thd, &tmp_table, item, item->type(),
|
field= create_tmp_field(thd, &tmp_table, item, item->type(),
|
||||||
(Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0,
|
(Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0,
|
||||||
@ -3271,7 +3277,10 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
|
|||||||
if (info.handle_duplicates == DUP_UPDATE)
|
if (info.handle_duplicates == DUP_UPDATE)
|
||||||
table->file->extra(HA_EXTRA_INSERT_WITH_UPDATE);
|
table->file->extra(HA_EXTRA_INSERT_WITH_UPDATE);
|
||||||
if (!thd->prelocked_mode)
|
if (!thd->prelocked_mode)
|
||||||
|
{
|
||||||
table->file->start_bulk_insert((ha_rows) 0);
|
table->file->start_bulk_insert((ha_rows) 0);
|
||||||
|
is_bulk_insert_mode= TRUE;
|
||||||
|
}
|
||||||
thd->abort_on_warning= (!info.ignore &&
|
thd->abort_on_warning= (!info.ignore &&
|
||||||
(thd->variables.sql_mode &
|
(thd->variables.sql_mode &
|
||||||
(MODE_STRICT_TRANS_TABLES |
|
(MODE_STRICT_TRANS_TABLES |
|
||||||
|
@ -6427,7 +6427,12 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
|
|||||||
ST_SCHEMA_TABLE *schema_table= find_schema_table(thd, ptr->table_name);
|
ST_SCHEMA_TABLE *schema_table= find_schema_table(thd, ptr->table_name);
|
||||||
if (!schema_table ||
|
if (!schema_table ||
|
||||||
(schema_table->hidden &&
|
(schema_table->hidden &&
|
||||||
lex->orig_sql_command == SQLCOM_END)) // not a 'show' command
|
(lex->orig_sql_command == SQLCOM_END || // not a 'show' command
|
||||||
|
/*
|
||||||
|
this check is used for show columns|keys from I_S hidden table
|
||||||
|
*/
|
||||||
|
lex->orig_sql_command == SQLCOM_SHOW_FIELDS ||
|
||||||
|
lex->orig_sql_command == SQLCOM_SHOW_KEYS)))
|
||||||
{
|
{
|
||||||
my_error(ER_UNKNOWN_TABLE, MYF(0),
|
my_error(ER_UNKNOWN_TABLE, MYF(0),
|
||||||
ptr->table_name, INFORMATION_SCHEMA_NAME.str);
|
ptr->table_name, INFORMATION_SCHEMA_NAME.str);
|
||||||
|
@ -14330,6 +14330,9 @@ change_to_use_tmp_fields(THD *thd, Item **ref_pointer_array,
|
|||||||
item_field= (Item*) new Item_field(field);
|
item_field= (Item*) new Item_field(field);
|
||||||
if (!item_field)
|
if (!item_field)
|
||||||
DBUG_RETURN(TRUE); // Fatal error
|
DBUG_RETURN(TRUE); // Fatal error
|
||||||
|
|
||||||
|
if (item->real_item()->type() != Item::FIELD_ITEM)
|
||||||
|
field->orig_table= 0;
|
||||||
item_field->name= item->name;
|
item_field->name= item->name;
|
||||||
if (item->type() == Item::REF_ITEM)
|
if (item->type() == Item::REF_ITEM)
|
||||||
{
|
{
|
||||||
@ -15469,6 +15472,55 @@ static void print_join(THD *thd, String *str, List<TABLE_LIST> *tables)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
@brief Print an index hint for a table
|
||||||
|
|
||||||
|
@details Prints out the USE|FORCE|IGNORE index hints for a table.
|
||||||
|
|
||||||
|
@param thd the current thread
|
||||||
|
@param[out] str appends the index hint here
|
||||||
|
@param hint what the hint is (as string : "USE INDEX"|
|
||||||
|
"FORCE INDEX"|"IGNORE INDEX")
|
||||||
|
@param hint_length the length of the string in 'hint'
|
||||||
|
@param indexes a list of index names for the hint
|
||||||
|
*/
|
||||||
|
|
||||||
|
void
|
||||||
|
TABLE_LIST::print_index_hint(THD *thd, String *str,
|
||||||
|
const char *hint, uint32 hint_length,
|
||||||
|
List<String> indexes)
|
||||||
|
{
|
||||||
|
List_iterator_fast<String> li(indexes);
|
||||||
|
String *idx;
|
||||||
|
bool first= 1;
|
||||||
|
size_t find_length= strlen(primary_key_name);
|
||||||
|
|
||||||
|
str->append (' ');
|
||||||
|
str->append (hint, hint_length);
|
||||||
|
str->append (STRING_WITH_LEN(" ("));
|
||||||
|
while ((idx = li++))
|
||||||
|
{
|
||||||
|
if (first)
|
||||||
|
first= 0;
|
||||||
|
else
|
||||||
|
str->append(',');
|
||||||
|
/*
|
||||||
|
It's safe to use ptr() here because we compare the length first
|
||||||
|
and we rely that my_strcasecmp will not access more than length()
|
||||||
|
chars from the string. See test_if_string_in_list() for similar
|
||||||
|
implementation.
|
||||||
|
*/
|
||||||
|
if (find_length == idx->length() &&
|
||||||
|
!my_strcasecmp (system_charset_info, primary_key_name,
|
||||||
|
idx->ptr()))
|
||||||
|
str->append(primary_key_name);
|
||||||
|
else
|
||||||
|
append_identifier (thd, str, idx->ptr(), idx->length());
|
||||||
|
}
|
||||||
|
str->append(')');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Print table as it should be in join list
|
Print table as it should be in join list
|
||||||
|
|
||||||
@ -15536,6 +15588,17 @@ void TABLE_LIST::print(THD *thd, String *str)
|
|||||||
str->append(' ');
|
str->append(' ');
|
||||||
append_identifier(thd, str, alias, strlen(alias));
|
append_identifier(thd, str, alias, strlen(alias));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (use_index)
|
||||||
|
{
|
||||||
|
if (force_index)
|
||||||
|
print_index_hint(thd, str, STRING_WITH_LEN("FORCE INDEX"), *use_index);
|
||||||
|
else
|
||||||
|
print_index_hint(thd, str, STRING_WITH_LEN("USE INDEX"), *use_index);
|
||||||
|
}
|
||||||
|
if (ignore_index)
|
||||||
|
print_index_hint (thd, str, STRING_WITH_LEN("IGNORE INDEX"), *ignore_index);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -223,9 +223,6 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
|
|||||||
{
|
{
|
||||||
LEX *lex= thd->lex;
|
LEX *lex= thd->lex;
|
||||||
bool link_to_local;
|
bool link_to_local;
|
||||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
||||||
bool definer_check_is_needed= mode != VIEW_ALTER || lex->definer;
|
|
||||||
#endif
|
|
||||||
/* first table in list is target VIEW name => cut off it */
|
/* first table in list is target VIEW name => cut off it */
|
||||||
TABLE_LIST *view= lex->unlink_first_table(&link_to_local);
|
TABLE_LIST *view= lex->unlink_first_table(&link_to_local);
|
||||||
TABLE_LIST *tables= lex->query_tables;
|
TABLE_LIST *tables= lex->query_tables;
|
||||||
@ -280,7 +277,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
|
|||||||
- same as current user
|
- same as current user
|
||||||
- current user has SUPER_ACL
|
- current user has SUPER_ACL
|
||||||
*/
|
*/
|
||||||
if (definer_check_is_needed &&
|
if (lex->definer &&
|
||||||
(strcmp(lex->definer->user.str, thd->security_ctx->priv_user) != 0 ||
|
(strcmp(lex->definer->user.str, thd->security_ctx->priv_user) != 0 ||
|
||||||
my_strcasecmp(system_charset_info,
|
my_strcasecmp(system_charset_info,
|
||||||
lex->definer->host.str,
|
lex->definer->host.str,
|
||||||
@ -925,6 +922,15 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table,
|
|||||||
DBUG_RETURN(0);
|
DBUG_RETURN(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (table->use_index || table->ignore_index)
|
||||||
|
{
|
||||||
|
my_error(ER_WRONG_USAGE, MYF(0),
|
||||||
|
table->ignore_index ? "IGNORE INDEX" :
|
||||||
|
(table->force_index ? "FORCE INDEX" : "USE INDEX"),
|
||||||
|
"VIEW");
|
||||||
|
DBUG_RETURN(TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
/* check loop via view definition */
|
/* check loop via view definition */
|
||||||
for (TABLE_LIST *precedent= table->referencing_view;
|
for (TABLE_LIST *precedent= table->referencing_view;
|
||||||
precedent;
|
precedent;
|
||||||
|
@ -773,6 +773,8 @@ struct TABLE_LIST
|
|||||||
private:
|
private:
|
||||||
bool prep_check_option(THD *thd, uint8 check_opt_type);
|
bool prep_check_option(THD *thd, uint8 check_opt_type);
|
||||||
bool prep_where(THD *thd, Item **conds, bool no_where_clause);
|
bool prep_where(THD *thd, Item **conds, bool no_where_clause);
|
||||||
|
void print_index_hint(THD *thd, String *str, const char *hint,
|
||||||
|
uint32 hint_length, List<String>);
|
||||||
/*
|
/*
|
||||||
Cleanup for re-execution in a prepared statement or a stored
|
Cleanup for re-execution in a prepared statement or a stored
|
||||||
procedure.
|
procedure.
|
||||||
|
@ -15490,7 +15490,7 @@ static void test_bug21635()
|
|||||||
char *query_end;
|
char *query_end;
|
||||||
MYSQL_RES *result;
|
MYSQL_RES *result;
|
||||||
MYSQL_FIELD *field;
|
MYSQL_FIELD *field;
|
||||||
unsigned int field_count, i;
|
unsigned int field_count, i, j;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
DBUG_ENTER("test_bug21635");
|
DBUG_ENTER("test_bug21635");
|
||||||
@ -15506,28 +15506,35 @@ static void test_bug21635()
|
|||||||
myquery(rc);
|
myquery(rc);
|
||||||
rc= mysql_query(mysql, "CREATE TABLE t1 (i INT)");
|
rc= mysql_query(mysql, "CREATE TABLE t1 (i INT)");
|
||||||
myquery(rc);
|
myquery(rc);
|
||||||
rc= mysql_query(mysql, "INSERT INTO t1 VALUES (1)");
|
/*
|
||||||
myquery(rc);
|
We need this loop to ensure correct behavior with both constant and
|
||||||
|
non-constant tables.
|
||||||
rc= mysql_real_query(mysql, query, query_end - query);
|
*/
|
||||||
myquery(rc);
|
for (j= 0; j < 2 ; j++)
|
||||||
|
|
||||||
result= mysql_use_result(mysql);
|
|
||||||
DIE_UNLESS(result);
|
|
||||||
|
|
||||||
field_count= mysql_field_count(mysql);
|
|
||||||
for (i= 0; i < field_count; ++i)
|
|
||||||
{
|
{
|
||||||
field= mysql_fetch_field_direct(result, i);
|
rc= mysql_query(mysql, "INSERT INTO t1 VALUES (1)");
|
||||||
printf("%s -> %s ... ", expr[i * 2], field->name);
|
myquery(rc);
|
||||||
fflush(stdout);
|
|
||||||
DIE_UNLESS(field->db[0] == 0 && field->org_table[0] == 0 &&
|
|
||||||
field->table[0] == 0 && field->org_name[0] == 0);
|
|
||||||
DIE_UNLESS(strcmp(field->name, expr[i * 2 + 1]) == 0);
|
|
||||||
puts("OK");
|
|
||||||
}
|
|
||||||
|
|
||||||
mysql_free_result(result);
|
rc= mysql_real_query(mysql, query, query_end - query);
|
||||||
|
myquery(rc);
|
||||||
|
|
||||||
|
result= mysql_use_result(mysql);
|
||||||
|
DIE_UNLESS(result);
|
||||||
|
|
||||||
|
field_count= mysql_field_count(mysql);
|
||||||
|
for (i= 0; i < field_count; ++i)
|
||||||
|
{
|
||||||
|
field= mysql_fetch_field_direct(result, i);
|
||||||
|
printf("%s -> %s ... ", expr[i * 2], field->name);
|
||||||
|
fflush(stdout);
|
||||||
|
DIE_UNLESS(field->db[0] == 0 && field->org_table[0] == 0 &&
|
||||||
|
field->table[0] == 0 && field->org_name[0] == 0);
|
||||||
|
DIE_UNLESS(strcmp(field->name, expr[i * 2 + 1]) == 0);
|
||||||
|
puts("OK");
|
||||||
|
}
|
||||||
|
|
||||||
|
mysql_free_result(result);
|
||||||
|
}
|
||||||
rc= mysql_query(mysql, "DROP TABLE t1");
|
rc= mysql_query(mysql, "DROP TABLE t1");
|
||||||
myquery(rc);
|
myquery(rc);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user