Commit 4ed45460 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

Changes for the BitKeeper resolve. 

One more notice:

limiting number of queries per hour for different users has been done
on 4.0.1 , but I can port it to 3.23.* 

This will require only certain changes, like number of columns in user
table.

I will also make a test case for it, after it is approved by Monty, 
as result file will depend on the error message text.
parents 0111030d 038db406

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
.out

.snprj/*

.vimrc

50

=6

BitKeeper/etc/config

BitKeeper/etc/csets
@@ -413,6 +414,7 @@ sql/mysqld 
sql/mysqld-purecov

sql/mysqld-purify

sql/mysqld-quantify

sql/new.cc

sql/share/*.sys

sql/share/charsets/gmon.out

sql/share/gmon.out

libmysqld/lib_sql.cc

+2 −2
Original line number Diff line number Diff line
@@ -228,11 +228,11 @@ check_connections2(THD * thd) 
  return 0;

}





static bool check_user(THD *thd,enum_server_command command, const char *user,

		       const char *passwd, const char *db, bool check_count)

{

  NET *net= &thd->net;

  uint max=0;

  thd->db=0;



  if (!(thd->user = my_strdup(user, MYF(0))))
@@ -244,7 +244,7 @@ static bool check_user(THD *thd,enum_server_command command, const char *user, 
				 passwd, thd->scramble, &thd->priv_user,

				 protocol_version == 9 ||

				 !(thd->client_capabilities &

				   CLIENT_LONG_PASSWORD));

				   CLIENT_LONG_PASSWORD),&max);

  DBUG_PRINT("general",

	     ("Capabilities: %d  packet_length: %d  Host: '%s'  User: '%s'  Using password: %s  Access: %u  db: '%s'",

	      thd->client_capabilities, thd->max_packet_length,

mysql-test/r/multi_update.result

+10 −9
Original line number Diff line number Diff line
@@ -2,32 +2,33 @@ drop table if exists t1,t2,t3; 
create table t1(id1 int not null auto_increment primary key, t char(12));

create table t2(id2 int not null, t char(12));

create table t3(id3 int not null, t char(12), index(id3));

delete t1.*, t2.*, t3.*  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 9500;

update t1,t2,t3 set t1.t="aaa", t2.t="bbb", t3.t="cc" where  t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 90;

delete t1.*, t2.*, t3.*  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 95;

check table t1, t2, t3;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

test.t2	check	status	OK

test.t3	check	status	OK

select count(*) from t1 where id1 > 9500;

select count(*) from t1 where id1 > 95;

count(*)

0

select count(*) from t2 where id2 > 9500;

select count(*) from t2 where id2 > 95;

count(*)

0

select count(*) from t3 where id3 > 9500;

select count(*) from t3 where id3 > 95;

count(*)

0

delete t1, t2, t3  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 500;

select count(*) from t1 where id1 > 500;

delete t1, t2, t3  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 5;

select count(*) from t1 where id1 > 5;

count(*)

0

select count(*) from t2 where id2 > 500;

select count(*) from t2 where id2 > 5;

count(*)

0

select count(*) from t3 where id3 > 500;

select count(*) from t3 where id3 > 5;

count(*)

0

delete t1, t2, t3  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 0;

delete from t1, t2, t3  using t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 0;

select count(*) from t1 where id1;

count(*)

0

mysql-test/t/multi_update.test

+13 −12
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ 
# Only run the test if we are using --big-test, because this test takes a

# long time

#

-- require r/big_test.require

eval select $BIG_TEST as using_big_test;

#-- require r/big_test.require

#eval select $BIG_TEST as using_big_test;



drop table if exists t1,t2,t3;

create table t1(id1 int not null auto_increment primary key, t char(12));

create table t2(id2 int not null, t char(12));

create table t3(id3 int not null, t char(12), index(id3));

disable_query_log;

let $1 = 10000;

let $1 = 100;

while ($1)

 {

  let $2 = 5;
@@ -29,20 +29,21 @@ while ($1) 
  dec $1;

 }

enable_query_log;

delete t1.*, t2.*, t3.*  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 9500;

update t1,t2,t3 set t1.t="aaa", t2.t="bbb", t3.t="cc" where  t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 90;

delete t1.*, t2.*, t3.*  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 95;



check table t1, t2, t3;



select count(*) from t1 where id1 > 9500;

select count(*) from t2 where id2 > 9500;

select count(*) from t3 where id3 > 9500;

select count(*) from t1 where id1 > 95;

select count(*) from t2 where id2 > 95;

select count(*) from t3 where id3 > 95;



delete t1, t2, t3  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 500;

select count(*) from t1 where id1 > 500;

select count(*) from t2 where id2 > 500;

select count(*) from t3 where id3 > 500;

delete t1, t2, t3  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 5;

select count(*) from t1 where id1 > 5;

select count(*) from t2 where id2 > 5;

select count(*) from t3 where id3 > 5;



delete t1, t2, t3  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 0;

delete from t1, t2, t3  using t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 0;



# These queries will force a scan of the table

select count(*) from t1 where id1;

scripts/mysql_install_db.sh

+9 −6
Original line number Diff line number Diff line
@@ -228,18 +228,21 @@ then 
  c_u="$c_u   ssl_cipher BLOB NOT NULL,"

  c_u="$c_u   x509_issuer BLOB NOT NULL,"

  c_u="$c_u   x509_subject BLOB NOT NULL,"

  c_u="$c_u   max_questions int(11) unsigned DEFAULT 0  NOT NULL,"

  c_u="$c_u   max_updates int(11) unsigned DEFAULT 0  NOT NULL,"

  c_u="$c_u   max_connections int(11) unsigned DEFAULT 0  NOT NULL,"

  c_u="$c_u   PRIMARY KEY Host (Host,User)"

  c_u="$c_u )"

  c_u="$c_u comment='Users and global privileges';"



  i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','','');

  INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','','');

  i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','','',0,0,0);

  INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','','',0,0,0);

  

  REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','','');

  REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','','');

  REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','','',0,0,0);

  REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','','',0,0,0);

  

  INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','NONE','','','');

  INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','NONE','','','');"

  INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','NONE','','','',0,0,0);

  INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','NONE','','','',0,0,0);"

fi



if test ! -f $mdata/func.frm