diff options
| author | unknown <andrey@example.com> | 2006-08-14 15:26:59 +0200 |
|---|---|---|
| committer | unknown <andrey@example.com> | 2006-08-14 15:26:59 +0200 |
| commit | 66fb56f1158453262581be4efa2c0232dff6bd6b (patch) | |
| tree | 383d73f49b56ca07c2200d1bcb11c1ea020525e1 /mysql-test/r/sp_notembedded.result | |
| parent | 021cea21fdbfe50db647fe2ab3606f1e075c0654 (diff) | |
| parent | 3391899858d2acb0d18e036ff7208116eab58aca (diff) | |
| download | mariadb-git-66fb56f1158453262581be4efa2c0232dff6bd6b.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337
into example.com:/work/mysql-5.1-runtime-wl3337
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp_notembedded.result:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/share/errmsg.txt:
C
mysql-test/r/events_bugs.result:
update result
manual merge
mysql-test/r/ps_1general.result:
update result
manual merge
sql/sql_yacc.yy:
manual merge
Diffstat (limited to 'mysql-test/r/sp_notembedded.result')
| -rw-r--r-- | mysql-test/r/sp_notembedded.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result index a15f5013ef6..564b8031c35 100644 --- a/mysql-test/r/sp_notembedded.result +++ b/mysql-test/r/sp_notembedded.result @@ -18,11 +18,9 @@ show processlist; end| call bug4902_2()| Id User Host db Command Time State Info -# event_scheduler localhost NULL Connect # Suspended NULL # root localhost test Query # NULL show processlist call bug4902_2()| Id User Host db Command Time State Info -# event_scheduler localhost NULL Connect # Suspended NULL # root localhost test Query # NULL show processlist drop procedure bug4902_2| drop table if exists t1| |