diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-10-31 17:24:32 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-10-31 17:24:32 -0400 |
| commit | cca4ea275bc24a48e48703ed357752c416710a20 (patch) | |
| tree | 665a520664743bd33169c3aaafedcb407c8c4de5 /mysql-test/t/profiling.test | |
| parent | fc70ac4627c4d7094dc1c1b4d6d61ab81fcd5546 (diff) | |
| parent | 4c0078853fbd2052270198217aa19d573a516f92 (diff) | |
| download | mariadb-git-cca4ea275bc24a48e48703ed357752c416710a20.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
CMakeLists.txt:
Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
Auto merged
BitKeeper/deleted/.del-README~1:
Auto merged
BitKeeper/deleted/.del-configure.js:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
BitKeeper/triggers/post-commit:
Auto merged
client/CMakeLists.txt:
Auto merged
extra/CMakeLists.txt:
Auto merged
include/config-win.h:
Auto merged
libmysql/CMakeLists.txt:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/r/func_in.result:
Auto merged
mysql-test/r/information_schema_db.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
server-tools/instance-manager/CMakeLists.txt:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/myisam/CMakeLists.txt:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
Manual merge.
configure.in:
Manual merge.
mysql-test/r/information_schema.result:
Manual merge.
mysql-test/t/profiling.test:
Manual merge.
sql/set_var.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_profile.cc:
Manual merge.
sql/sql_profile.h:
Manual merge.
sql/sql_select.cc:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/table.h:
Manual merge.
storage/ndb/src/common/util/File.cpp:
Manual merge.
support-files/mysql.spec.sh:
Manual merge.
Diffstat (limited to 'mysql-test/t/profiling.test')
| -rw-r--r-- | mysql-test/t/profiling.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/profiling.test b/mysql-test/t/profiling.test index 173d7ec0c96..c86ad60e59b 100644 --- a/mysql-test/t/profiling.test +++ b/mysql-test/t/profiling.test @@ -1,5 +1,10 @@ --source include/have_community_features.inc +# Verify that the protocol isn't violated if we ask for profiling info +# before profiling has recorded anything. +show profiles; +show profile all; + # default is OFF show session variables like 'profil%'; select @@profiling; |