← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/my_static.cc

  • Committer: Jay Pipes
  • Date: 2010-03-09 20:02:29 UTC
  • mto: This revision was merged to the branch mainline in revision 1339.
  • Revision ID: jpipes@serialcoder-20100309200229-dfrliy4fads9vyf4
https://launchpad.net/bugs/535296
Fixes Bug #535296 by only incrementing ha_commit_count when its a normal transaction commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/my_static.cc
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
/*
17
17
  Static variables for mysys library. All definied here for easy making of
18
18
  a shared library
19
19
*/
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
 
23
 
#include <drizzled/internal/my_sys.h>
24
 
#include <drizzled/error.h>
 
23
#include "drizzled/internal/my_sys.h"
 
24
#include "drizzled/error.h"
25
25
#include "my_static.h"
26
26
#include <stdlib.h>
27
27
 
28
 
#include <drizzled/visibility.h>
29
 
 
30
28
namespace drizzled
31
29
{
32
30
namespace internal
39
37
const char      *my_progname=0;
40
38
char curr_dir[FN_REFLEN]= {0},
41
39
     home_dir_buff[FN_REFLEN]= {0};
42
 
DRIZZLED_API int my_umask=0664;
43
 
int my_umask_dir=0777;
 
40
int my_umask=0664, my_umask_dir=0777;
44
41
uint32_t   my_file_limit= MY_NFILE;
45
42
 
46
43
        /* From mf_brkhant */
67
64
unsigned char *sf_min_adress= (unsigned char*) ~(unsigned long) 0L,
68
65
     *sf_max_adress= (unsigned char*) 0L;
69
66
/* Root of the linked list of struct st_irem */
70
 
irem *sf_malloc_root = NULL;
 
67
struct st_irem *sf_malloc_root = NULL;
71
68
 
72
69
        /* from my_alarm */
73
70
int volatile my_have_got_alarm=0;       /* declare variable to reset */