diff options
| author | unknown <monty@donna.mysql.fi> | 2001-03-07 23:50:44 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-03-07 23:50:44 +0200 |
| commit | 5151b5520edafd3374093a73635ef52d4044f10e (patch) | |
| tree | 5185e82a23f37f9c337833e5c194164d9eaf8804 /sql/sql_parse.cc | |
| parent | e3dc55a839a23d6f1b63f05238d0b33454b7a5ab (diff) | |
| download | mariadb-git-5151b5520edafd3374093a73635ef52d4044f10e.tar.gz | |
Fixed test cases for innobase
Fixed bug introduced with last ORDER BY optimization
Changed log position to longlong to avoid warnings.
Docs/manual.texi:
Update for innobase
mysql-test/r/innobase.result:
Fixed test cases
mysql-test/t/bdb.test:
Removed not used tables
mysql-test/t/innobase.test:
Fixed test cases
sql/field.h:
Fixed bug introduced with last ORDER BY optimization
sql/ha_berkeley.cc:
Fixed bug when index_init() was called twice.
sql/mysql_priv.h:
Added option to not get stack trace (when using gdb)
sql/mysqld.cc:
Added option to not get stack trace (when using gdb)
sql/slave.cc:
Changed log position to longlong to avoid warnings.
sql/slave.h:
Changed log position to longlong to avoid warnings.
sql/sql_parse.cc:
Removed warnings
sql/sql_select.cc:
Cleanups
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 0cf18edc4dc..31f59c5b850 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -263,7 +263,7 @@ static void decrease_user_connections(const char *user, const char *host) { char temp_user[USERNAME_LENGTH+HOSTNAME_LENGTH+2]; int temp_len; - struct user_conn uucc, *uc; + struct user_conn *uc; if (!max_user_connections) return; if (!user) @@ -285,7 +285,7 @@ static void decrease_user_connections(const char *user, const char *host) if (! --uc->connections) { /* Last connection for user; Delete it */ - (void) hash_delete(&hash_user_connections,(char *) uc); + (void) hash_delete(&hash_user_connections,(byte*) uc); } end: (void) pthread_mutex_unlock(&LOCK_user_conn); |