diff options
| author | kostja@bodhi.local <> | 2006-07-19 22:33:19 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-07-19 22:33:19 +0400 |
| commit | f22a4ce1a174ee7d651540947dfa437ef0ea6a16 (patch) | |
| tree | 72597d625ecfd2d08568d72222348e925c5b5e7d /sql/sp.cc | |
| parent | b304cb6da8e0cb24d212e9b044125471981a19b4 (diff) | |
| download | mariadb-git-f22a4ce1a174ee7d651540947dfa437ef0ea6a16.tar.gz | |
A fix and a test case for Bug#21002 "Derived table not selecting from a
"real" table fails in JOINs".
This is a regression caused by the fix for Bug 18444.
This fix removed the assignment of empty_c_string to table->db performed
in add_table_to_list, as neither me nor anyone else knew what it was
there for. Now we know it and it's covered with tests: the only case
when a table database name can be empty is when the table is a derived
table. The fix puts the assignment back but makes it a bit more explicit.
Additionally, finally drop sp.result.orig which was checked in by mistake.
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 553465ebff8..a7078da2f50 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1846,7 +1846,6 @@ sp_use_new_db(THD *thd, LEX_STRING new_db, LEX_STRING *old_db, bool no_access_check, bool *dbchangedp) { int ret; - static char empty_c_string[1]= {0}; /* used for not defined db */ DBUG_ENTER("sp_use_new_db"); DBUG_PRINT("enter", ("newdb: %s", new_db.str)); |