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

references lp:1011983

Browse Source 
Merged latest MariaDB development in: bzr merge lp:maria/5.5
=> 
Text conflict in CMakeLists.txt
Text conflict in sql/handler.h
Text conflict in support-files/CMakeLists.txt
3 conflicts
This commit is contained in:
Seppo Jaakola
2012-06-12 16:34:18 +03:00
parent 33ffe0dd29 9892ace475
commit b96af9a3ab
512 changed files with 5116 additions and 5794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.h
View File

@ -4079,6 +4079,7 @@ public:
class select_dumpvar :public select_result_interceptor {
ha_rows row_count;
Item_func_set_user_var **set_var_items;
public:
List<my_var> var_list;
select_dumpvar() { var_list.empty(); row_count= 0;}