summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/mysql.cc2
-rw-r--r--sql/field.cc2
-rw-r--r--sql/filesort.cc8
-rw-r--r--sql/key.cc4
-rw-r--r--sql/lock.cc4
-rw-r--r--sql/log.cc4
-rw-r--r--sql/records.cc2
-rw-r--r--sql/sql_acl.cc2
-rw-r--r--sql/sql_base.cc2
-rw-r--r--sql/sql_lex.cc6
-rw-r--r--sql/sql_prepare.cc2
11 files changed, 19 insertions, 19 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 4400e53b6a8..8cada731d70 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3133,7 +3133,7 @@ static int
com_help(String *buffer __attribute__((unused)),
char *line __attribute__((unused)))
{
- reg1 int i, j;
+ int i, j;
char * help_arg= strchr(line,' '), buff[32], *end;
if (help_arg)
{
diff --git a/sql/field.cc b/sql/field.cc
index 60df918bd63..a8d82170d52 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -2797,7 +2797,7 @@ int Field_decimal::store(double nr)
return 1;
}
- reg4 uint i;
+ uint i;
size_t length;
uchar fyllchar,*to;
char buff[DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE];
diff --git a/sql/filesort.cc b/sql/filesort.cc
index db52debe957..2bab4390309 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -1167,9 +1167,9 @@ Type_handler_real_result::make_sort_key(uchar *to, Item *item,
static void make_sortkey(Sort_param *param, uchar *to, uchar *ref_pos)
{
- reg3 Field *field;
- reg1 SORT_FIELD *sort_field;
- reg5 uint length;
+ Field *field;
+ SORT_FIELD *sort_field;
+ uint length;
for (sort_field=param->local_sortorder ;
sort_field != param->end ;
@@ -1258,7 +1258,7 @@ static void make_sortkey(Sort_param *param, uchar *to, uchar *ref_pos)
static void register_used_fields(Sort_param *param)
{
- reg1 SORT_FIELD *sort_field;
+ SORT_FIELD *sort_field;
TABLE *table=param->sort_form;
for (sort_field= param->local_sortorder ;
diff --git a/sql/key.cc b/sql/key.cc
index 4abba249af1..08bd6e8f65d 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -52,8 +52,8 @@
int find_ref_key(KEY *key, uint key_count, uchar *record, Field *field,
uint *key_length, uint *keypart)
{
- reg2 int i;
- reg3 KEY *key_info;
+ int i;
+ KEY *key_info;
uint fieldpos;
fieldpos= field->offset(record);
diff --git a/sql/lock.cc b/sql/lock.cc
index 79ce27b9937..85a32b54081 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -378,7 +378,7 @@ end:
static int lock_external(THD *thd, TABLE **tables, uint count)
{
- reg1 uint i;
+ uint i;
int lock_type,error;
DBUG_ENTER("lock_external");
@@ -530,7 +530,7 @@ void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table)
{
if (locked)
{
- reg1 uint i;
+ uint i;
for (i=0; i < locked->table_count; i++)
{
if (locked->table[i] == table)
diff --git a/sql/log.cc b/sql/log.cc
index a480db7d79d..973aecb16e8 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2419,7 +2419,7 @@ static int find_uniq_filename(char *name, ulong next_log_number)
uint i;
char buff[FN_REFLEN], ext_buf[FN_REFLEN];
struct st_my_dir *dir_info;
- reg1 struct fileinfo *file_info;
+ struct fileinfo *file_info;
ulong max_found, next, UNINIT_VAR(number);
size_t buf_length, length;
char *start, *end;
@@ -8482,7 +8482,7 @@ void MYSQL_BIN_LOG::set_max_size(ulong max_size_arg)
static bool test_if_number(const char *str, ulong *res, bool allow_wildcards)
{
- reg2 int flag;
+ int flag;
const char *start;
DBUG_ENTER("test_if_number");
diff --git a/sql/records.cc b/sql/records.cc
index f16bdcff6e6..7d36d52228b 100644
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -631,7 +631,7 @@ static int init_rr_cache(THD *thd, READ_RECORD *info)
static int rr_from_cache(READ_RECORD *info)
{
- reg1 uint i;
+ uint i;
ulong length;
my_off_t rest_of_file;
int16 error;
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index b3059248ac0..29f181320c7 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -11346,7 +11346,7 @@ int fill_schema_applicable_roles(THD *thd, TABLE_LIST *tables, COND *cond)
int wild_case_compare(CHARSET_INFO *cs, const char *str,const char *wildstr)
{
- reg3 int flag;
+ int flag;
DBUG_ENTER("wild_case_compare");
DBUG_PRINT("enter",("str: '%s' wildstr: '%s'",str,wildstr));
while (*wildstr)
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index cc34b103a15..e20ad15ae51 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -7014,7 +7014,7 @@ bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array,
List<Item> *sum_func_list, List<Item> *pre_fix,
bool allow_sum_func)
{
- reg2 Item *item;
+ Item *item;
enum_mark_columns save_mark_used_columns= thd->mark_used_columns;
nesting_map save_allow_sum_func= thd->lex->allow_sum_func;
List_iterator<Item> it(fields);
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 4c8ac42ab98..3e36cac96b9 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1008,7 +1008,7 @@ Lex_input_stream::unescape(CHARSET_INFO *cs, char *to,
bool Lex_input_stream::get_text(LEX_STRING *dst, uint sep,
int pre_skip, int post_skip)
{
- reg1 uchar c;
+ uchar c;
uint found_escape=0;
CHARSET_INFO *cs= m_thd->charset();
@@ -1188,7 +1188,7 @@ static inline uint int_token(const char *str,uint length)
*/
bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted)
{
- reg1 uchar c;
+ uchar c;
while (! lip->eof())
{
c= lip->yyGet();
@@ -1286,7 +1286,7 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd)
static int lex_one_token(YYSTYPE *yylval, THD *thd)
{
- reg1 uchar UNINIT_VAR(c);
+ uchar UNINIT_VAR(c);
bool comment_closed;
int tokval, result_state;
uint length;
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index ee92df7c6b8..d0dbf90f093 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -427,7 +427,7 @@ static bool send_prep_stmt(Prepared_statement *stmt,
static ulong get_param_length(uchar **packet, ulong len)
{
- reg1 uchar *pos= *packet;
+ uchar *pos= *packet;
if (len < 1)
return 0;
if (*pos < 251)
View Lorry Controller Status