diff options
| author | unknown <kostja@bodhi.local> | 2006-08-14 16:30:57 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-08-14 16:30:57 +0400 |
| commit | 021cea21fdbfe50db647fe2ab3606f1e075c0654 (patch) | |
| tree | 213e7c7f15ac23c498fb6ddc5dd3d27425757f43 /mysql-test/r/events_bugs.result | |
| parent | 2f48a59124c776c36ea6609f31543bf6c5f8ed86 (diff) | |
| parent | 675a5b776d693b64d72227dea86f51cb9ca31781 (diff) | |
| download | mariadb-git-021cea21fdbfe50db647fe2ab3606f1e075c0654.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/sql_db.cc:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/events_bugs.result')
| -rw-r--r-- | mysql-test/r/events_bugs.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result index a7c2964a253..45733c91622 100644 --- a/mysql-test/r/events_bugs.result +++ b/mysql-test/r/events_bugs.result @@ -106,9 +106,9 @@ set global event_scheduler= 1; select /*2*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info; user host db command state info event_scheduler localhost NULL Connect Sleeping NULL -root localhost events_test Connect User lock select get_lock('ee_16407_2', 60) /*ee_16407_2*/ -root localhost events_test Connect User lock select get_lock('ee_16407_2', 60) /*ee_16407_3*/ -root localhost events_test Connect User lock select get_lock('ee_16407_2', 60) /*ee_16407_4*/ +root localhost events_test Connect User lock select get_lock('ee_16407_2', 60) +root localhost events_test Connect User lock select get_lock('ee_16407_2', 60) +root localhost events_test Connect User lock select get_lock('ee_16407_2', 60) select release_lock('ee_16407_2'); release_lock('ee_16407_2') 1 @@ -154,8 +154,8 @@ set global event_scheduler= 1; select /*4*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info; user host db command state info event_scheduler localhost NULL Connect Sleeping NULL -root localhost events_test Connect User lock select get_lock('ee_16407_5', 60) /*ee_16407_5*/ -root localhost events_test Connect User lock select get_lock('ee_16407_5', 60) /*ee_16407_6*/ +root localhost events_test Connect User lock select get_lock('ee_16407_5', 60) +root localhost events_test Connect User lock select get_lock('ee_16407_5', 60) select release_lock('ee_16407_5'); release_lock('ee_16407_5') 1 |