summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-06-15 23:24:37 +0300
committerunknown <monty@narttu.mysql.fi>2003-06-15 23:24:37 +0300
commited1d28fdb6b6c828556917716c9b700bf7450426 (patch)
tree3b1cb9a063538f009e13b645f481a46e4f8620f6 /sql
parentfb2825e2b5bb05addbc836ae773783f8c652dd54 (diff)
downloadmariadb-git-ed1d28fdb6b6c828556917716c9b700bf7450426.tar.gz
Fixes for make_win_src_distributions
Removed compiler warnings scripts/make_win_src_distribution.sh: Added option --dirname Also copy sql-common directory Create mysql data files even if mysqld is not installed scripts/mysql_create_system_tables.sh: Update for usage with make_win_src_distribution scripts/mysql_install_db.sh: Update for usage with make_win_src_distribution sql-common/client.c: Portability fix sql/item_cmpfunc.cc: Removed compiler warning sql/sql_acl.cc: Indentation cleanup Removed compiler warning sql/sql_parse.cc: Removed compiler warning sql/sql_select.cc: Removed compiler warning sql/sql_yacc.yy: Removed compiler warning strings/ctype-utf8.c: Removed compiler warning
Diffstat (limited to 'sql')
-rw-r--r--sql/item_cmpfunc.cc2
-rw-r--r--sql/sql_acl.cc14
-rw-r--r--sql/sql_parse.cc1
-rw-r--r--sql/sql_select.cc3
-rw-r--r--sql/sql_yacc.yy2
5 files changed, 13 insertions, 9 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 74036edf605..d4997f78a9e 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -1652,7 +1652,9 @@ Item_cond::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
{
List_iterator<Item> li(list);
Item *item;
+#ifndef EMBEDDED_LIBRARY
char buff[sizeof(char*)]; // Max local vars in function
+#endif
used_tables_cache=0;
const_item_cache=0;
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 49aad321702..1bdca7167e8 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -3337,15 +3337,19 @@ int mysql_drop_user(THD *thd, List <LEX_USER> &list)
}
tables[0].table->field[0]->store(user_name->host.str,(uint)
- user_name->host.length, system_charset_info);
+ user_name->host.length,
+ system_charset_info);
tables[0].table->field[1]->store(user_name->user.str,(uint)
- user_name->user.length, system_charset_info);
+ user_name->user.length,
+ system_charset_info);
if (!tables[0].table->file->index_read_idx(tables[0].table->record[0],0,
- (byte*) tables[0].table->field[0]->ptr,0,
+ (byte*) tables[0].table->
+ field[0]->ptr,0,
HA_READ_KEY_EXACT))
{
int error;
- if ((error = tables[0].table->file->delete_row(tables[0].table->record[0])))
+ if ((error = tables[0].table->file->delete_row(tables[0].table->
+ record[0])))
{
tables[0].table->file->print_error(error, MYF(0));
tables[0].table->file->index_end();
@@ -3355,7 +3359,7 @@ int mysql_drop_user(THD *thd, List <LEX_USER> &list)
}
tables[0].table->file->index_end();
}
-err:
+
VOID(pthread_mutex_unlock(&acl_cache->lock));
rw_unlock(&LOCK_grant);
close_thread_tables(thd);
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a9a29904b60..47c7026c184 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2308,7 +2308,6 @@ mysql_execute_command(THD *thd)
break;
}
case SQLCOM_UPDATE:
- TABLE_LIST *table;
if (check_db_used(thd,tables))
goto error;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index a5fd69c8fbb..248496d6b43 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -8061,7 +8061,6 @@ void free_underlaid_joins(THD *thd, SELECT_LEX *select)
bool JOIN::rollup_init()
{
uint i,j;
- ORDER *group;
Item **ref_array;
tmp_table_param.quick_group= 0; // Can't create groups in tmp table
@@ -8145,7 +8144,7 @@ bool JOIN::rollup_make_fields(List<Item> &all_fields, List<Item> &fields,
...
*/
- for (level=0 ; level < send_group_parts > 0 ; level++)
+ for (level=0 ; level < send_group_parts ; level++)
{
uint i;
uint pos= send_group_parts - level -1;
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 91bd5a77d27..c385d6d5308 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3850,7 +3850,7 @@ purge_option:
}
Item *tmp= new Item_func_unix_timestamp($2);
Lex->sql_command = SQLCOM_PURGE_BEFORE;
- Lex->purge_time= tmp->val_int();
+ Lex->purge_time= (ulong) tmp->val_int();
}
;