Commit 222cd6e8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/opt/local/work/tmp_merge 

into  mysql.com:/opt/local/work/mysql-5.1-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/set_var.cc:
  Manual merge.
sql/set_var.h:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.
parents 24c005cf c5ed5c4b

mysql-test/r/ps.result

+130 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ set @fvar= 123.4567; 
prepare stmt1 from @fvar;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '123.4567' at line 1

drop table t1,t2;

deallocate prepare stmt3;

deallocate prepare stmt4;

deallocate prepare stmt5;

PREPARE stmt1 FROM "select _utf8 'A' collate utf8_bin = ?";

set @var='A';

EXECUTE stmt1 USING @var;
@@ -253,6 +256,7 @@ set names latin1; 
execute ``;

1234

1234

deallocate prepare ``;

set names default;

create table t1 (a varchar(10)) charset=utf8;

insert into t1 (a) values ('yahoo');
@@ -781,6 +785,7 @@ EXECUTE b12651; 
1

DROP VIEW b12651_V1;

DROP TABLE b12651_T1, b12651_T2;

DEALLOCATE PREPARE b12651;

prepare stmt from "select @@time_zone";

execute stmt;

@@time_zone
@@ -873,6 +878,130 @@ length(a) 
10

drop table t1;

deallocate prepare stmt;

create table t1 (col1 integer, col2 integer);

insert into t1 values(100,100),(101,101),(102,102),(103,103);

prepare stmt from 'select col1, col2 from t1 where (col1, col2) in ((?,?))';

set @a=100, @b=100;

execute stmt using @a,@b;

col1	col2

100	100

set @a=101, @b=101;

execute stmt using @a,@b;

col1	col2

101	101

set @a=102, @b=102;

execute stmt using @a,@b;

col1	col2

102	102

set @a=102, @b=103;

execute stmt using @a,@b;

col1	col2

deallocate prepare stmt;

drop table t1;

set @old_max_prepared_stmt_count= @@max_prepared_stmt_count;

show variables like 'max_prepared_stmt_count';

Variable_name	Value

max_prepared_stmt_count	16382

show variables like 'prepared_stmt_count';

Variable_name	Value

prepared_stmt_count	0

select @@max_prepared_stmt_count, @@prepared_stmt_count;

@@max_prepared_stmt_count	@@prepared_stmt_count

16382	0

set global max_prepared_stmt_count=-1;

select @@max_prepared_stmt_count;

@@max_prepared_stmt_count

0

set global max_prepared_stmt_count=10000000000000000;

select @@max_prepared_stmt_count;

@@max_prepared_stmt_count

1048576

set global max_prepared_stmt_count=default;

select @@max_prepared_stmt_count;

@@max_prepared_stmt_count

16382

set @@max_prepared_stmt_count=1;

ERROR HY000: Variable 'max_prepared_stmt_count' is a GLOBAL variable and should be set with SET GLOBAL

set max_prepared_stmt_count=1;

ERROR HY000: Variable 'max_prepared_stmt_count' is a GLOBAL variable and should be set with SET GLOBAL

set local max_prepared_stmt_count=1;

ERROR HY000: Variable 'max_prepared_stmt_count' is a GLOBAL variable and should be set with SET GLOBAL

set local prepared_stmt_count=0;

ERROR HY000: Variable 'prepared_stmt_count' is a read only variable

set @@prepared_stmt_count=0;

ERROR HY000: Variable 'prepared_stmt_count' is a read only variable

set global prepared_stmt_count=1;

ERROR HY000: Variable 'prepared_stmt_count' is a read only variable

set global max_prepared_stmt_count=1;

select @@max_prepared_stmt_count;

@@max_prepared_stmt_count

1

set global max_prepared_stmt_count=0;

select @@max_prepared_stmt_count, @@prepared_stmt_count;

@@max_prepared_stmt_count	@@prepared_stmt_count

0	0

prepare stmt from "select 1";

ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 0)

select @@prepared_stmt_count;

@@prepared_stmt_count

0

set global max_prepared_stmt_count=1;

prepare stmt from "select 1";

select @@prepared_stmt_count;

@@prepared_stmt_count

1

prepare stmt1 from "select 1";

ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 1)

select @@prepared_stmt_count;

@@prepared_stmt_count

1

deallocate prepare stmt;

select @@prepared_stmt_count;

@@prepared_stmt_count

0

prepare stmt from "select 1";

select @@prepared_stmt_count;

@@prepared_stmt_count

1

prepare stmt from "select 2";

select @@prepared_stmt_count;

@@prepared_stmt_count

1

select @@prepared_stmt_count, @@max_prepared_stmt_count;

@@prepared_stmt_count	@@max_prepared_stmt_count

1	1

set global max_prepared_stmt_count=0;

prepare stmt from "select 1";

ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 0)

execute stmt;

ERROR HY000: Unknown prepared statement handler (stmt) given to EXECUTE

select @@prepared_stmt_count;

@@prepared_stmt_count

0

prepare stmt from "select 1";

ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 0)

select @@prepared_stmt_count;

@@prepared_stmt_count

0

set global max_prepared_stmt_count=3;

select @@max_prepared_stmt_count, @@prepared_stmt_count;

@@max_prepared_stmt_count	@@prepared_stmt_count

3	0

prepare stmt from "select 1";

prepare stmt from "select 2";

prepare stmt1 from "select 3";

prepare stmt2 from "select 4";

ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 3)

prepare stmt2 from "select 4";

ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 3)

select @@max_prepared_stmt_count, @@prepared_stmt_count;

@@max_prepared_stmt_count	@@prepared_stmt_count

3	3

deallocate prepare stmt;

select @@max_prepared_stmt_count, @@prepared_stmt_count;

@@max_prepared_stmt_count	@@prepared_stmt_count

3	0

set global max_prepared_stmt_count= @old_max_prepared_stmt_count;

create table t1 (id int);

prepare ins_call from "insert into t1 (id) values (1)";

execute ins_call;
@@ -883,6 +1012,7 @@ drop table t1; 
create table t1 (a int, b int);

insert into t1 (a,b) values (2,8),(1,9),(3,7);

prepare stmt from "select * from t1 order by ?";

set @a=NULL;

execute stmt using @a;

a	b

2	8

mysql-test/t/ps.test

+143 −0
Original line number Diff line number Diff line
@@ -114,6 +114,9 @@ set @fvar= 123.4567; 
prepare stmt1 from @fvar;



drop table t1,t2;

deallocate prepare stmt3;

deallocate prepare stmt4;

deallocate prepare stmt5;



#

# Bug #4105: Server crash on attempt to prepare a statement with character
@@ -257,6 +260,7 @@ prepare `ü` from 'select 1234'; 
execute `ü` ;

set names latin1;

execute ``;

deallocate prepare ``;

set names default;
@@ -823,6 +827,7 @@ EXECUTE b12651; 


DROP VIEW b12651_V1;

DROP TABLE b12651_T1, b12651_T2;

DEALLOCATE PREPARE b12651;



#

# Bug#9359 "Prepared statements take snapshot of system vars at PREPARE
@@ -921,6 +926,143 @@ select length(a) from t1; 
drop table t1;

deallocate prepare stmt;



#

# Bug#16248 "WHERE (col1,col2) IN ((?,?)) gives wrong results":

# check that ROW implementation is reexecution-friendly.

#

create table t1 (col1 integer, col2 integer);

insert into t1 values(100,100),(101,101),(102,102),(103,103);

prepare stmt from 'select col1, col2 from t1 where (col1, col2) in ((?,?))';

set @a=100, @b=100;

execute stmt using @a,@b;

set @a=101, @b=101;

execute stmt using @a,@b;

set @a=102, @b=102;

execute stmt using @a,@b;

set @a=102, @b=103;

execute stmt using @a,@b;

deallocate prepare stmt;

drop table t1;



#

# Bug#16365 Prepared Statements: DoS with too many open statements

# Check that the limit @@max_prpeared_stmt_count works.

#

# Save the old value

set @old_max_prepared_stmt_count= @@max_prepared_stmt_count;

#

# Disable prepared statement protocol: in this test we set

# @@max_prepared_stmt_count to 0 or 1 and would like to test the limit

# manually.

#

--disable_ps_protocol

#

# A. Check that the new variables are present in SHOW VARIABLES list.

#

show variables like 'max_prepared_stmt_count';

show variables like 'prepared_stmt_count';

#

# B. Check that the new variables are selectable.

#

select @@max_prepared_stmt_count, @@prepared_stmt_count;

#

# C. Check that max_prepared_stmt_count is settable (global only),

#    whereas prepared_stmt_count is readonly.

#

set global max_prepared_stmt_count=-1;

select @@max_prepared_stmt_count;

set global max_prepared_stmt_count=10000000000000000;

select @@max_prepared_stmt_count;

set global max_prepared_stmt_count=default;

select @@max_prepared_stmt_count;

--error ER_GLOBAL_VARIABLE

set @@max_prepared_stmt_count=1;

--error ER_GLOBAL_VARIABLE

set max_prepared_stmt_count=1;

--error ER_GLOBAL_VARIABLE

set local max_prepared_stmt_count=1;

--error ER_INCORRECT_GLOBAL_LOCAL_VAR

set local prepared_stmt_count=0;

--error ER_INCORRECT_GLOBAL_LOCAL_VAR

set @@prepared_stmt_count=0;

--error ER_INCORRECT_GLOBAL_LOCAL_VAR 

set global prepared_stmt_count=1;

# set to a reasonable limit works

set global max_prepared_stmt_count=1;

select @@max_prepared_stmt_count;

#

# D. Check that the variables actually work.

#

set global max_prepared_stmt_count=0;

select @@max_prepared_stmt_count, @@prepared_stmt_count;

--error ER_MAX_PREPARED_STMT_COUNT_REACHED

prepare stmt from "select 1";

select @@prepared_stmt_count;

set global max_prepared_stmt_count=1;

prepare stmt from "select 1";

select @@prepared_stmt_count;

--error ER_MAX_PREPARED_STMT_COUNT_REACHED

prepare stmt1 from "select 1";

select @@prepared_stmt_count;

deallocate prepare stmt;

select @@prepared_stmt_count;

#

# E. Check that we can prepare a statement with the same name 

# successfully, without hitting the limit.

#

prepare stmt from "select 1";

select @@prepared_stmt_count;

prepare stmt from "select 2";

select @@prepared_stmt_count;

#

# F. We can set the max below the current count. In this case no new 

# statements should be allowed to prepare.

#

select @@prepared_stmt_count, @@max_prepared_stmt_count;

set global max_prepared_stmt_count=0;

--error ER_MAX_PREPARED_STMT_COUNT_REACHED

prepare stmt from "select 1";

# Result: the old statement is deallocated, the new is not created.

--error 1243 # ER_UNKNOWN_STMT_HANDLER

execute stmt;

select @@prepared_stmt_count;

--error ER_MAX_PREPARED_STMT_COUNT_REACHED

prepare stmt from "select 1";

select @@prepared_stmt_count;

#

# G. Show that the variables are up to date even after a connection with all

# statements in it was terminated.

#

set global max_prepared_stmt_count=3;

select @@max_prepared_stmt_count, @@prepared_stmt_count;

prepare stmt from "select 1";

connect (con1,localhost,root,,);

connection con1;

prepare stmt from "select 2";

prepare stmt1 from "select 3";

--error ER_MAX_PREPARED_STMT_COUNT_REACHED

prepare stmt2 from "select 4";

connection default;

--error ER_MAX_PREPARED_STMT_COUNT_REACHED

prepare stmt2 from "select 4";

select @@max_prepared_stmt_count, @@prepared_stmt_count;

disconnect con1;

connection default;

# Wait for the connection to die: deal with a possible race

deallocate prepare stmt;

let $count= `select @@prepared_stmt_count`;

if ($count)

{

--sleep 2

  let $count= `select @@prepared_stmt_count`;

}

select @@max_prepared_stmt_count, @@prepared_stmt_count;

#

# Restore the old value.

#

set global max_prepared_stmt_count= @old_max_prepared_stmt_count;

--enable_ps_protocol



# End of 4.1 tests



#
@@ -946,6 +1088,7 @@ insert into t1 (a,b) values (2,8),(1,9),(3,7); 


# Will order by index

prepare stmt from "select * from t1 order by ?";

set @a=NULL;

execute stmt using @a;

set @a=1;

execute stmt using @a;

sql/item_row.cc

+15 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
*/



Item_row::Item_row(List<Item> &arg):

  Item(), used_tables_cache(0), array_holder(1), const_item_cache(1), with_null(0)

  Item(), used_tables_cache(0), const_item_cache(1), with_null(0)

{



  //TODO: think placing 2-3 component items in item (as it done for function)
@@ -85,6 +85,20 @@ bool Item_row::fix_fields(THD *thd, Item **ref) 
}





void Item_row::cleanup()

{

  DBUG_ENTER("Item_row::cleanup");



  Item::cleanup();

  /* Reset to the original values */

  used_tables_cache= 0;

  const_item_cache= 1;

  with_null= 0;



  DBUG_VOID_RETURN;

}





void Item_row::split_sum_func(THD *thd, Item **ref_pointer_array,

                              List<Item> &fields)

{

sql/item_row.h

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ class Item_row: public Item 
  Item **items;

  table_map used_tables_cache;

  uint arg_count;

  bool array_holder;

  bool const_item_cache;

  bool with_null;

public:
@@ -29,7 +28,6 @@ class Item_row: public Item 
    items(item->items),

    used_tables_cache(item->used_tables_cache),

    arg_count(item->arg_count),

    array_holder(0), 

    const_item_cache(item->const_item_cache),

    with_null(0)

  {}
@@ -62,6 +60,7 @@ class Item_row: public Item 
    return 0;

  };

  bool fix_fields(THD *thd, Item **ref);

  void cleanup();

  void split_sum_func(THD *thd, Item **ref_pointer_array, List<Item> &fields);

  table_map used_tables() const { return used_tables_cache; };

  bool const_item() const { return const_item_cache; };

sql/mysql_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@ extern ulong slave_net_timeout, slave_trans_retries; 
extern uint max_user_connections;

extern ulong what_to_log,flush_time;

extern ulong query_buff_size, thread_stack;

extern ulong max_prepared_stmt_count, prepared_stmt_count;

extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit;

extern ulong max_binlog_size, max_relay_log_size;

#ifdef HAVE_ROW_BASED_REPLICATION
@@ -1350,6 +1351,7 @@ extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, LOCK_lock_db, 
       LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone,

       LOCK_slave_list, LOCK_active_mi, LOCK_manager, LOCK_global_read_lock,

       LOCK_global_system_variables, LOCK_user_conn,

       LOCK_prepared_stmt_count,

       LOCK_bytes_sent, LOCK_bytes_received;

#ifdef HAVE_OPENSSL

extern pthread_mutex_t LOCK_des_key_file;