diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-05-26 09:28:56 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-05-26 09:28:56 +0300 |
| commit | 22d356c807693212d1e7c96524a0ec420d8df955 (patch) | |
| tree | 495d601fd4a17f9db224eba84f0fd2b80c1a5b5e /sql/sql_derived.cc | |
| parent | a6ebf38d72b9e3852e51314a87d636e2c6f8c37d (diff) | |
| parent | 716d6c47ac7c0027a0f45a7981e1841686fd43f9 (diff) | |
| download | mariadb-git-22d356c807693212d1e7c96524a0ec420d8df955.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 2bf1a68e504..0be3c542416 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -200,7 +200,8 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, if (tables) { for (TABLE_LIST *cursor= tables; cursor; cursor= cursor->next) - cursor->table_list->table=cursor->table; + if (cursor->table_list) + cursor->table_list->table=cursor->table; } } else |