diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-05-07 22:20:42 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-05-07 22:20:42 +0200 |
| commit | ad1e123f478e170cdbed5fd0e6a58277e61326ad (patch) | |
| tree | fd4bc4e87a0385cd676cd34fe9ba93dd57358f2e /sql/sql_class.h | |
| parent | 066dc9a281ee8932827f7e6180dd0fa1bfe5d922 (diff) | |
| parent | 582b7283472a43af5d7fb51386df055ea9d44a96 (diff) | |
| download | mariadb-git-ad1e123f478e170cdbed5fd0e6a58277e61326ad.tar.gz | |
Merge 5.5.24 back into main 5.5.
This is a weave merge, but without any conflicts.
In 14 source files, the copyright year needed to be updated to 2012.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index f107bfe4a69..bffa490ebe3 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3533,6 +3533,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;} |