diff options
| author | vva@eagle.mysql.r18.ru <> | 2003-05-30 14:09:32 -0400 |
|---|---|---|
| committer | vva@eagle.mysql.r18.ru <> | 2003-05-30 14:09:32 -0400 |
| commit | 5d4f9011a43912d791113b5f496d504ac2cd96b2 (patch) | |
| tree | b42e3851015e82e2fa79a8ac229b84253a438182 /sql | |
| parent | adb8c7e0406d79213478d73eaa1af42b2e31f4db (diff) | |
| parent | 694b6f0bde9c93c45f232a476c4e5c45d4f3a17a (diff) | |
| download | mariadb-git-5d4f9011a43912d791113b5f496d504ac2cd96b2.tar.gz | |
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/NEW_HELP/4.1.clear
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_help.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index a9b89a728d2..2925141d331 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -557,7 +557,7 @@ int send_variant_2_list(MEM_ROOT *mem_root, Protocol *protocol, List_iterator<String> it(*names); String *cur_name; - while (*pos++= it++); + while ((*pos++= it++)); qsort(pointers,names->elements,sizeof(String*),string_ptr_cmp); @@ -689,7 +689,7 @@ int mysqld_help(THD *thd, const char *mask) goto end; } - for (int i=0; i<sizeof(tables)/sizeof(TABLE_LIST); i++) + for (size_t i=0; i<sizeof(tables)/sizeof(TABLE_LIST); i++) tables[i].table->file->init_table_handle_for_HANDLER(); if (!(select_topics_by_name= |