Fixes for valgrind

Added optimzation for clustered index
Fixed bug in UPDATE ... ORDER BY
Fixed handling of UPDATE ... LIMIT


BitKeeper/deleted/.del-.cvsignore~7e29af89a3559f4c:
  Delete: Images/.cvsignore
BitKeeper/deleted/.del-README~d5a4e7ca3a2e87a9:
  Delete: repl-tests/README
BitKeeper/deleted/.del-run-all-tests~4deb6479a13e4568:
  Delete: repl-tests/run-all-tests
BitKeeper/deleted/.del-run.test~3dc5b9bd1e9feea5:
  Delete: repl-tests/test-repl-alter/run.test
BitKeeper/deleted/.del-run.test~4020771cff278f14:
  Delete: repl-tests/test-bad-query/run.test
BitKeeper/deleted/.del-run.test~452f2b66537404a8:
  Delete: repl-tests/test-dump/run.test
BitKeeper/deleted/.del-run.test~b1f0c1f96554df8:
  Delete: repl-tests/test-auto-inc/run.test
BitKeeper/deleted/.del-table-dump-check.master~e13afeb8c79264b5:
  Delete: repl-tests/test-dump/table-dump-check.master
BitKeeper/deleted/.del-table-dump-select.master~744acb955e33f3db:
  Delete: repl-tests/test-dump/table-dump-select.master
BitKeeper/deleted/.del-x.master~29a93ed7956c8693:
  Delete: repl-tests/test-auto-inc/x.master
BitKeeper/deleted/.del-x.master~3b248cbac9abda2b:
  Delete: repl-tests/test-bad-query/x.master
BitKeeper/deleted/.del-foo-dump-master.master~b49ae6bec1e918ee:
  Delete: repl-tests/test-repl/foo-dump-master.master
BitKeeper/deleted/.del-foo-dump-slave.master~f16ed20457d59be9:
  Delete: repl-tests/test-repl/foo-dump-slave.master
BitKeeper/deleted/.del-repl-timestamp.master.reject~3492d2b74b413771:
  Delete: repl-tests/test-repl-ts/repl-timestamp.master.reject
BitKeeper/deleted/.del-repl-timestamp.master~4b7782da5cc13161:
  Delete: repl-tests/test-repl-ts/repl-timestamp.master
BitKeeper/deleted/.del-run.test~a1e32ea1e4253af4:
  Delete: repl-tests/test-repl/run.test
BitKeeper/deleted/.del-run.test~ce5e626c91b760ec:
  Delete: repl-tests/test-repl-ts/run.test
BitKeeper/deleted/.del-sum-wlen-master.master~1a5ea625c79e978:
  Delete: repl-tests/test-repl/sum-wlen-master.master
BitKeeper/deleted/.del-sum-wlen-slave.master~f016d98833433084:
  Delete: repl-tests/test-repl/sum-wlen-slave.master
BitKeeper/deleted/.del-test.master~5829e7b3770179db:
  Delete: repl-tests/test-repl-alter/test.master
BitKeeper/deleted/.del-master-slave.inc~6775f6ae10137c39:
  Delete: repl-tests/include/master-slave.inc
include/my_global.h:
  Fix for purify/valgrind
myisam/mi_info.c:
  Updated comment
mysql-test/r/group_by.result:
  New test results
mysql-test/r/innodb.result:
  New test results
mysql-test/r/join_outer.result:
  New test results
mysql-test/r/multi_update.result:
  New test results
mysql-test/r/null_key.result:
  New test results
mysql-test/r/update.result:
  New test results
mysql-test/t/group_by.test:
  Added extra explain to 'suspicious' test.
mysql-test/t/innodb.test:
  Added test for UPDATE ... ORDER BY
mysql-test/t/join_outer.test:
  Changed test to be repeatable
mysql-test/t/multi_update.test:
  Slight change of test to catch more bugs
mysql-test/t/update.test:
  Better test for UPDATE ... ORDER BY
sql/field.cc:
  Simple optimization
sql/ha_heap.h:
  Added optimzation for clustered index
sql/ha_innodb.cc:
  Added optimzation for clustered index
sql/ha_innodb.h:
  Added optimzation for clustered index
sql/handler.h:
  Added optimzation for clustered index
sql/item_sum.cc:
  Removed some usage of current_thd
sql/mysqld.cc:
  Fix bug when compiling for purify/valgrind
sql/opt_range.cc:
  Added optimzation for clustered index
sql/records.cc:
  Fixed comment
sql/sql_list.h:
  Fixed comment
sql/sql_select.cc:
  Removed some usage of current_thd
sql/sql_select.h:
  Removed some usage of current_thd
sql/sql_union.cc:
  Removed some usage of current_thd
sql/sql_update.cc:
  Fixed bug in UPDATE ... ORDER BY
  Fixed handling of UPDATE ... LIMIT
support-files/my-huge.cnf.sh:
  Added default size for query cache
support-files/my-large.cnf.sh:
  Added default size for query cache

20 files changed, 0 insertions, 151 deletions

diff --git a/repl-tests/README b/repl-tests/README
deleted file mode 100644
index 95611c6538d..00000000000
--- a/repl-tests/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory contains a set of test cases for replication. To get it
-to work on your system, install this version of MySQL on the master and on
-the slave, configure them according to the Replication HOWTO in the manual,
-modify include/master-slave.inc to specify correct connection parameters
-for the master and the slave and do
-
-sh run-all-tests
-
-If you would like to add your own test case, create a directory
-test-your-test-case-name, write your own run.test following the examples
-in the other test cases. Note that you can create the files containing
-the expected output ( master files) by running mysqltest --record < run.test
\ No newline at end of file
diff --git a/repl-tests/include/master-slave.inc b/repl-tests/include/master-slave.inc
deleted file mode 100644
index ad2dea1f520..00000000000
--- a/repl-tests/include/master-slave.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-connect (slave,localhost,root,,test,0,/var/lib/mysql/mysql.sock);
-connect (master,sarochka,admin,,test,0,0);
diff --git a/repl-tests/run-all-tests b/repl-tests/run-all-tests
deleted file mode 100755
index d9f08d8a8fb..00000000000
--- a/repl-tests/run-all-tests
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-for d in test-*; do
-cd $d
-echo -n $d | sed -e s/test-//
-echo -n "...."
-../../client/mysqltest $@ < run.test
-cd ..
-done
\ No newline at end of file
diff --git a/repl-tests/test-auto-inc/run.test b/repl-tests/test-auto-inc/run.test
deleted file mode 100755
index 8405329f458..00000000000
--- a/repl-tests/test-auto-inc/run.test
+++ /dev/null
@@ -1,10 +0,0 @@
-source ../include/master-slave.inc;
-connection master;
-drop table if exists x;
-create table x(n int auto_increment primary key);
-set insert_id = 2000;
-insert into x values (NULL),(NULL),(NULL);
-connection slave;
-sleep 3;
-@x.master select * from x;
- 
diff --git a/repl-tests/test-auto-inc/x.master b/repl-tests/test-auto-inc/x.master
deleted file mode 100644
index c76fc46ae97..00000000000
--- a/repl-tests/test-auto-inc/x.master
+++ /dev/null
@@ -1,4 +0,0 @@
-n	
-2000	
-2001	
-2002	
diff --git a/repl-tests/test-bad-query/run.test b/repl-tests/test-bad-query/run.test
deleted file mode 100755
index a86aaf84096..00000000000
--- a/repl-tests/test-bad-query/run.test
+++ /dev/null
@@ -1,10 +0,0 @@
-source ../include/master-slave.inc;
-connection master;
-drop table if exists x;
-create table x(n int primary key);
-!insert into x values (1),(2),(2);
-insert into x values (3);
-connection slave;
-sleep 3;
-@x.master select * from x;
- 
diff --git a/repl-tests/test-bad-query/x.master b/repl-tests/test-bad-query/x.master
deleted file mode 100644
index c62967af0bb..00000000000
--- a/repl-tests/test-bad-query/x.master
+++ /dev/null
@@ -1,4 +0,0 @@
-n	
-1	
-2	
-3	
diff --git a/repl-tests/test-dump/run.test b/repl-tests/test-dump/run.test
deleted file mode 100644
index c714186a67b..00000000000
--- a/repl-tests/test-dump/run.test
+++ /dev/null
@@ -1,25 +0,0 @@
-source ../include/master-slave.inc;
-connection slave;
-!slave stop;
-flush slave;
-connection master;
-flush master;
-connection slave;
-slave start;
-connection master;
-use test;
-drop table if exists words;
-create table words (word char(20) not null, index(word));
-load data infile '/usr/dict/words' into table words;
-drop table if exists words1;
-create table words1 (word char(20) not null);
-load data infile '/usr/dict/words' into table words1;
-sleep 20;
-connection slave;
-use test;
-drop table if exists words;
-load table words from master;
-drop table if exists words1;
-load table words1 from master;
-@table-dump-check.master check table words;
-@table-dump-select.master select count(*) from words1;
diff --git a/repl-tests/test-dump/table-dump-check.master b/repl-tests/test-dump/table-dump-check.master
deleted file mode 100644
index 4061fdb4a0d..00000000000
--- a/repl-tests/test-dump/table-dump-check.master
+++ /dev/null
@@ -1,2 +0,0 @@
-Table	Op	Msg_type	Msg_text	
-test.words	check	status	OK	
diff --git a/repl-tests/test-dump/table-dump-select.master b/repl-tests/test-dump/table-dump-select.master
deleted file mode 100644
index ae93d31c066..00000000000
--- a/repl-tests/test-dump/table-dump-select.master
+++ /dev/null
@@ -1,2 +0,0 @@
-count(*)	
-45402	
diff --git a/repl-tests/test-repl-alter/run.test b/repl-tests/test-repl-alter/run.test
deleted file mode 100644
index 2e031010d5c..00000000000
--- a/repl-tests/test-repl-alter/run.test
+++ /dev/null
@@ -1,12 +0,0 @@
-source ../include/master-slave.inc;
-connection master;
-drop table if exists test;
-CREATE TABLE test (name varchar(64), age smallint(3));
-INSERT INTO  test SET name='Andy', age=31;
-INSERT test SET name='Jacob', age=2;
-INSERT into test SET name='Caleb', age=1;
-ALTER TABLE test ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;
-@test.master select * from test;
-connection slave;
-sleep 3;
-@test.master select * from test;
diff --git a/repl-tests/test-repl-alter/test.master b/repl-tests/test-repl-alter/test.master
deleted file mode 100644
index 763154b938e..00000000000
--- a/repl-tests/test-repl-alter/test.master
+++ /dev/null
@@ -1,4 +0,0 @@
-name	age	id	
-Andy	31	00000001	
-Jacob	2	00000002	
-Caleb	1	00000003	
diff --git a/repl-tests/test-repl-ts/repl-timestamp.master b/repl-tests/test-repl-ts/repl-timestamp.master
deleted file mode 100644
index c3e4a2326d0..00000000000
--- a/repl-tests/test-repl-ts/repl-timestamp.master
+++ /dev/null
@@ -1,2 +0,0 @@
-unix_timestamp(t)	
-200006	
diff --git a/repl-tests/test-repl-ts/repl-timestamp.master.reject b/repl-tests/test-repl-ts/repl-timestamp.master.reject
deleted file mode 100644
index 091b18351ed..00000000000
--- a/repl-tests/test-repl-ts/repl-timestamp.master.reject
+++ /dev/null
@@ -1,2 +0,0 @@
-unix_timestamp(t)	
-973999074	
diff --git a/repl-tests/test-repl-ts/run.test b/repl-tests/test-repl-ts/run.test
deleted file mode 100644
index 0a5224ce02a..00000000000
--- a/repl-tests/test-repl-ts/run.test
+++ /dev/null
@@ -1,17 +0,0 @@
-#! ../client/mysqltest
-# tests if the replicaion preserves timestamp properly
-
-source ../include/master-slave.inc;
-connection master;
-set timestamp=200006;
-drop table if exists foo;
-create table foo(t timestamp not null,a char(1));
-insert into foo ( a) values ('F');
-@repl-timestamp.master select unix_timestamp(t) from foo;
-sleep 3;
-connection slave;
-drop table if exists foo;
-load table foo from master;
-@repl-timestamp.master select unix_timestamp(t) from foo;
-
-
diff --git a/repl-tests/test-repl/foo-dump-master.master b/repl-tests/test-repl/foo-dump-master.master
deleted file mode 100644
index 982e0523cfb..00000000000
--- a/repl-tests/test-repl/foo-dump-master.master
+++ /dev/null
@@ -1,3 +0,0 @@
-n	
-1	
-2	
diff --git a/repl-tests/test-repl/foo-dump-slave.master b/repl-tests/test-repl/foo-dump-slave.master
deleted file mode 100644
index 982e0523cfb..00000000000
--- a/repl-tests/test-repl/foo-dump-slave.master
+++ /dev/null
@@ -1,3 +0,0 @@
-n	
-1	
-2	
diff --git a/repl-tests/test-repl/run.test b/repl-tests/test-repl/run.test
deleted file mode 100755
index cc93d964efa..00000000000
--- a/repl-tests/test-repl/run.test
+++ /dev/null
@@ -1,24 +0,0 @@
-source ../include/master-slave.inc;
-connection slave;
-!slave stop;
-connection master;
-flush master;
-connection slave;
-flush slave;
-!slave start;
-sleep 3;
-connection master;
-use test;
-drop table if exists words;
-create table words (word char(20) not null, index(word));
-load data infile '/usr/dict/words' into table words;
-drop table if exists foo;
-create table foo(n int);
-insert into foo values(1),(2);
-@foo-dump-master.master select * from foo;
-@sum-wlen-master.master select sum(length(word)) from words;
-connection slave;
-sleep 15;
-use test;
-@sum-wlen-slave.master select sum(length(word)) from words;
-@foo-dump-slave.master select * from foo;
diff --git a/repl-tests/test-repl/sum-wlen-master.master b/repl-tests/test-repl/sum-wlen-master.master
deleted file mode 100644
index e749ab4840a..00000000000
--- a/repl-tests/test-repl/sum-wlen-master.master
+++ /dev/null
@@ -1,2 +0,0 @@
-sum(length(word))	
-363634	
diff --git a/repl-tests/test-repl/sum-wlen-slave.master b/repl-tests/test-repl/sum-wlen-slave.master
deleted file mode 100644
index e749ab4840a..00000000000
--- a/repl-tests/test-repl/sum-wlen-slave.master
+++ /dev/null
@@ -1,2 +0,0 @@
-sum(length(word))	
-363634