database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge mysql.com:/home/my/mysql-5.0

Browse Source 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
This commit is contained in:
monty@narttu.mysql.fi
2007-01-27 03:46:45 +02:00
parent c022454e7c 120e3f5ee1
commit 8a80e36ac3
215 changed files with 3302 additions and 3092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_lex.h
View File

@@ -432,7 +432,8 @@ protected:
select_result *result;
ulonglong found_rows_for_union;
bool res;
bool saved_error;
public:
bool prepared, // prepare phase already performed for UNION (unit)
optimized, // optimize phase already performed for UNION (unit)