diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-10-03 16:54:26 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-10-03 16:54:26 +0300 |
| commit | 8f7a2b2785cec83f3c00047b5d3fb76d85ecbe62 (patch) | |
| tree | f4c99a6c2b4ed9003c893e7098a0c957d720e317 /sql/sql_lex.cc | |
| parent | 95e772b65678b182bff5b52f3f5386d894419147 (diff) | |
| download | mariadb-git-8f7a2b2785cec83f3c00047b5d3fb76d85ecbe62.tar.gz | |
Update after last merge. Fixes some wrong test results.
libmysql/libmysql.c:
Removed obsolete function (now in strings library)
mysql-test/r/rpl_log.result:
Updated results for 4.1
mysql-test/r/rpl_log_pos.result:
Updated results for 4.1
sql/item_strfunc.cc:
Added missing system_charset_info
sql/log_event.cc:
Portability fixes. More debugging.
sql/net_pkg.cc:
Added back setting of query_error as slave code is depeneding on this.
sql/sql_acl.cc:
Update after last merge
sql/sql_lex.cc:
Update after last merge
sql/sql_parse.cc:
Update after last merge
sql/sql_prepare.cc:
Update after last merge
sql/time.cc:
Update after last merge.
More comments
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index fc6265f05af..a8e9bfb1757 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1082,7 +1082,7 @@ bool st_select_lex_unit::create_total_list_n_last_return(THD *thd, st_lex *lex, for (cursor= **result; cursor; cursor= cursor->next) if (!strcmp(cursor->db, aux->db) && !strcmp(cursor->real_name, aux->real_name) && - !strcmp(cursor->name, aux->name)) + !strcmp(cursor->alias, aux->alias)) break; if (!cursor) { |