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

After-merge fixes for merge 10.0-base -> 10.0.

Browse Source
This commit is contained in:
unknown
2012-12-18 22:03:53 +01:00
parent 701419b02f
commit 5fe8e9f244
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.h
View File

@ -4369,12 +4369,12 @@ public:
/** /**
Statement that inserts new rows (INSERT, REPLACE, LOAD, ALTER TABLE) Statement that inserts new rows (INSERT, REPLACE, LOAD, ALTER TABLE)
*/ */
#define CF_INSERTS_DATA (1U << 11) #define CF_INSERTS_DATA (1U << 17)
/** /**
Statement that updates existing rows (UPDATE, multi-update) Statement that updates existing rows (UPDATE, multi-update)
*/ */
#define CF_UPDATES_DATA (1U << 12) #define CF_UPDATES_DATA (1U << 18)
/* Bits in server_command_flags */ /* Bits in server_command_flags */

1
storage/innobase/log/log0log.cc
View File

@ -37,6 +37,7 @@ Created 12/9/1995 Heikki Tuuri
#endif #endif
#ifndef UNIV_HOTBACKUP #ifndef UNIV_HOTBACKUP
#include "ha_prototypes.h"
#include "mem0mem.h" #include "mem0mem.h"
#include "buf0buf.h" #include "buf0buf.h"
#include "buf0flu.h" #include "buf0flu.h"