diff options
| author | unknown <hezx@hezx.(none)> | 2007-12-12 15:43:52 +0800 |
|---|---|---|
| committer | unknown <hezx@hezx.(none)> | 2007-12-12 15:43:52 +0800 |
| commit | 3fc4a67a1dbd6bfb67ccb771f589347abc7d5e2b (patch) | |
| tree | b63b24e8b3f627fa296c23e132a8abc2a11aa40d /sql | |
| parent | 127ef561294b08c743a394157f6fb64b09f4f5a2 (diff) | |
| parent | 77f4d9124f4dde94ee677fa60f12eddfae20d817 (diff) | |
| download | mariadb-git-3fc4a67a1dbd6bfb67ccb771f589347abc7d5e2b.tar.gz | |
Merge hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/mysql-5.0-rpl
into hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/merge-mysql-5.1-new-rpl
sql/sql_string.cc:
Auto merged
BitKeeper/deleted/.del-compile-solaris-amd64:
Auto merged
sql/sql_view.cc:
Manual merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_string.cc | 4 | ||||
| -rw-r--r-- | sql/sql_view.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index a8eb7360339..f97180474d1 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -297,8 +297,8 @@ bool String::copy_aligned(const char *str,uint32 arg_length, uint32 offset, return TRUE; /* - Note, this is only safe for little-endian UCS-2. - If we add big-endian UCS-2 sometimes, this code + Note, this is only safe for big-endian UCS-2. + If we add little-endian UCS-2 sometimes, this code will be more complicated. But it's OK for now. */ bzero((char*) Ptr, offset); diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 362bab2d700..41c0aff0cd1 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1540,6 +1540,8 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode) something_wrong= error || wrong_object_name || non_existant_views.length(); if (some_views_deleted || !something_wrong) { + DBUG_RETURN(TRUE); + } /* if something goes wrong, bin-log with possible error code, otherwise bin-log with error code cleared. */ |