Merge bk-internal.mysql.com:/data0/bk/mysql-5.0

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-community


sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

2 files changed, 69 insertions, 0 deletions

diff --git a/mysql-test/r/profile.result b/mysql-test/r/profile.result
new file mode 100644
index 00000000000..8a4db348445
--- /dev/null
+++ b/mysql-test/r/profile.result
@@ -0,0 +1,30 @@
+create table t1 (
+a int,
+b int
+);
+insert into t1 values (1,1), (2,null), (3, 4);
+insert into t1 values (5,1), (6,null), (7, 4);
+insert into t1 values (1,1), (2,null), (3, 4);
+insert into t1 values (5,1), (6,null), (7, 4);
+insert into t1 values (5,1), (6,null), (7, 4);
+select sum(a) from t1;
+select sum(a) from t1 group by b;
+select sum(a) + sum(b) from t1 group by b;
+select max(x) from (select sum(a) as x from t1 group by b) as teeone;
+show profiles;
+show profile for query 8;
+show profile cpu, block io for query 8;
+show profile cpu for query 8;
+show profile cpu for query 9 limit 2 offset 2;
+show profile cpu for query 10 limit 0;
+show profile cpu for query 65534;
+show profile memory;
+show profile block io;
+show profile context switches;
+show profile page faults;
+show profile ipc;
+show profile swaps limit 1 offset 2;
+show profile source;
+show profile all for query 0 limit 0;
+drop table t1;
+End of 5.0 tests
diff --git a/mysql-test/t/profile.test b/mysql-test/t/profile.test
new file mode 100644
index 00000000000..4cf2a3aa92f
--- /dev/null
+++ b/mysql-test/t/profile.test
@@ -0,0 +1,39 @@
+
+create table t1 (
+  a int,
+  b int
+);
+--disable_result_log
+insert into t1 values (1,1), (2,null), (3, 4);
+insert into t1 values (5,1), (6,null), (7, 4);
+insert into t1 values (1,1), (2,null), (3, 4);
+insert into t1 values (5,1), (6,null), (7, 4);
+insert into t1 values (5,1), (6,null), (7, 4);
+select sum(a) from t1;
+select sum(a) from t1 group by b;
+select sum(a) + sum(b) from t1 group by b;
+select max(x) from (select sum(a) as x from t1 group by b) as teeone;
+
+# Merely verify that commands work.  Checking values is impossible, right?
+show profiles;
+show profile for query 8;
+show profile cpu, block io for query 8;
+show profile cpu for query 8;
+show profile cpu for query 9 limit 2 offset 2;
+show profile cpu for query 10 limit 0;
+show profile cpu for query 65534;
+show profile memory;
+show profile block io;
+show profile context switches;
+show profile page faults;
+show profile ipc;
+show profile swaps limit 1 offset 2;
+show profile source;
+show profile all for query 0 limit 0;
+--enable_result_log
+
+drop table t1;
+
+
+##
+--echo End of 5.0 tests