Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
This commit is contained in:
bell@sanja.is.com.ua 2004-09-10 13:11:33 +03:00
commit 4cb6527421
9 changed files with 68 additions and 16 deletions

View file

@ -440,6 +440,7 @@ libmysqld/sql_state.c
libmysqld/sql_string.cc
libmysqld/sql_table.cc
libmysqld/sql_test.cc
libmysqld/sql_trigger.cc
libmysqld/sql_udf.cc
libmysqld/sql_union.cc
libmysqld/sql_unions.cc
@ -919,4 +920,3 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
libmysqld/sql_trigger.cc