diff options
| author | unknown <anozdrin/alik@alik.> | 2006-11-07 16:24:35 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.> | 2006-11-07 16:24:35 +0300 |
| commit | e50678f1cea5b0888490710f2542568581b198ec (patch) | |
| tree | 4c085423d9f65d9221f445b2bc03833ed5b266f0 /mysql-test/r/sp_notembedded.result | |
| parent | da032b99eb7b0621e333dc2b6f423d376017a503 (diff) | |
| parent | dd72647032cf157b063fe9a7f02ed2994734b1c0 (diff) | |
| download | mariadb-git-e50678f1cea5b0888490710f2542568581b198ec.tar.gz | |
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
configure.in:
Auto merged
include/my_time.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/kill.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/rename.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/time.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/mysql-test-run.pl:
Manually merged.
sql/sql_parse.cc:
Manually merged.
Diffstat (limited to 'mysql-test/r/sp_notembedded.result')
| -rw-r--r-- | mysql-test/r/sp_notembedded.result | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result index 564b8031c35..0b1fa565d28 100644 --- a/mysql-test/r/sp_notembedded.result +++ b/mysql-test/r/sp_notembedded.result @@ -74,8 +74,7 @@ flush status| flush query cache| delete from t1| drop procedure bug3583| -drop table t1; -#| +drop table t1| drop procedure if exists bug6807| create procedure bug6807() begin |