database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Applied all changes from Igor and Sanja

Browse Source
This commit is contained in:
Michael Widenius
2013-06-15 18:32:08 +03:00
parent 3143ad589a
commit 5f1f2fc0e4
162 changed files with 11704 additions and 6298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_prepare.h
View File

@ -253,16 +253,9 @@ public:
*/
ulong get_warn_count() const
{
return m_warning_info.warn_count();
return m_diagnostics_area.warn_count();
}
/**
Get the server warnings as a result set.
The result set has fixed metadata:
The first column is the level.
The second is a numeric code.
The third is warning text.
*/
List<MYSQL_ERROR> *get_warn_list() { return &m_warning_info.warn_list(); }
/**
The following members are only valid if execute_direct()
or move_to_next_result() returned an error.
@ -311,7 +304,6 @@ public:
~Ed_connection() { free_old_result(); }
private:
Diagnostics_area m_diagnostics_area;
Warning_info m_warning_info;
/**
Execute direct interface does not support multi-statements, only
multi-results. So we never have a situation when we have