Commit 7666b20f authored by serg@serg.mylan's avatar serg@serg.mylan

compatibility fixes

parent 3640233f
...@@ -269,7 +269,6 @@ SET @old_sql_mode= @@sql_mode, sql_mode= ''; ...@@ -269,7 +269,6 @@ SET @old_sql_mode= @@sql_mode, sql_mode= '';
SET @old_sql_quote_show_create= @@sql_quote_show_create, sql_quote_show_create= OFF; SET @old_sql_quote_show_create= @@sql_quote_show_create, sql_quote_show_create= OFF;
CREATE TABLE `a/b` (i INT); CREATE TABLE `a/b` (i INT);
ERROR 42000: Incorrect table name 'a/b' ERROR 42000: Incorrect table name 'a/b'
SET sql_mode= 'ANSI_QUOTES';
SET sql_mode= ''; SET sql_mode= '';
SET sql_quote_show_create= OFF; SET sql_quote_show_create= OFF;
CREATE TABLE t1 (i INT); CREATE TABLE t1 (i INT);
...@@ -401,10 +400,3 @@ where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3'; ...@@ -401,10 +400,3 @@ where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
delete from mysql.db delete from mysql.db
where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3'; where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
flush privileges; flush privileges;
set names latin1;
create database ``;
create table ``.`` (a int) engine=heap;
show table status from `` LIKE '';
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
HEAP 9 Fixed 0 5 # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL
drop database ``;
...@@ -1759,7 +1759,7 @@ double get_sweep_read_cost(const PARAM *param, ha_rows records) ...@@ -1759,7 +1759,7 @@ double get_sweep_read_cost(const PARAM *param, ha_rows records)
else else
{ {
double n_blocks= double n_blocks=
ceil((double)((longlong)param->table->file->data_file_length / IO_SIZE)); ceil((double)param->table->file->data_file_length / IO_SIZE);
double busy_blocks= double busy_blocks=
n_blocks * (1.0 - pow(1.0 - 1.0/n_blocks, rows2double(records))); n_blocks * (1.0 - pow(1.0 - 1.0/n_blocks, rows2double(records)));
if (busy_blocks < 1.0) if (busy_blocks < 1.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment