Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
b2bf1935
Commit
b2bf1935
authored
Apr 24, 2007
by
iggy@alf
Browse files
Options
Browse Files
Download
Plain Diff
Merge alf.:D:/src/mysql-5.1-maint
into alf.:D:/src/mysql-5.1-maint_pt
parents
b841154e
0f43ac0d
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1416 additions
and
4 deletions
+1416
-4
mysql-test/include/partition.inc
mysql-test/include/partition.inc
+1402
-0
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+12
-2
sql/log_event_old.cc
sql/log_event_old.cc
+2
-2
No files found.
mysql-test/include/partition.inc
0 → 100644
View file @
b2bf1935
This diff is collapsed.
Click to expand it.
scripts/CMakeLists.txt
View file @
b2bf1935
...
@@ -13,20 +13,30 @@
...
@@ -13,20 +13,30 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Build mysql_fix_privilege_tables.sql
ADD_CUSTOM_COMMAND
(
OUTPUT
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables.sql
COMMAND copy /b
mysql_system_tables.sql + mysql_system_tables_fix.sql
mysql_fix_privilege_tables.sql
DEPENDS
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_system_tables.sql
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_system_tables_fix.sql
)
# Build comp_sql - used for embedding SQL in C or C++ programs
ADD_EXECUTABLE
(
comp_sql comp_sql.c
)
ADD_EXECUTABLE
(
comp_sql comp_sql.c
)
TARGET_LINK_LIBRARIES
(
comp_sql dbug mysys strings
)
TARGET_LINK_LIBRARIES
(
comp_sql dbug mysys strings
)
#
Build comp_sql - used for embedding SQL in C or C++ programs
#
Use comp_sql to build mysql_fix_privilege_tables_sql.c
GET_TARGET_PROPERTY
(
COMP_SQL_EXE comp_sql LOCATION
)
GET_TARGET_PROPERTY
(
COMP_SQL_EXE comp_sql LOCATION
)
ADD_CUSTOM_COMMAND
(
OUTPUT
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables_sql.c
ADD_CUSTOM_COMMAND
(
OUTPUT
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables_sql.c
COMMAND
${
COMP_SQL_EXE
}
COMMAND
${
COMP_SQL_EXE
}
mysql_fix_privilege_tables
mysql_fix_privilege_tables
mysql_fix_privilege_tables.sql
mysql_fix_privilege_tables.sql
mysql_fix_privilege_tables_sql.c
mysql_fix_privilege_tables_sql.c
DEPENDS comp_sql
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables.sql
)
DEPENDS comp_sql
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables.sql
)
# Add dummy target for the above to be built
ADD_CUSTOM_TARGET
(
GenFixPrivs
ADD_CUSTOM_TARGET
(
GenFixPrivs
ALL
ALL
DEPENDS
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables_sql.c
)
DEPENDS
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables_sql.c
)
sql/log_event_old.cc
View file @
b2bf1935
...
@@ -84,8 +84,8 @@ int Update_rows_log_event_old::do_prepare_row(THD *thd,
...
@@ -84,8 +84,8 @@ int Update_rows_log_event_old::do_prepare_row(THD *thd,
row_start
,
&
m_cols
,
row_end
,
&
m_master_reclength
,
row_start
,
&
m_cols
,
row_end
,
&
m_master_reclength
,
table
->
write_set
,
PRE_GA_UPDATE_ROWS_EVENT
);
table
->
write_set
,
PRE_GA_UPDATE_ROWS_EVENT
);
DBUG_DUMP
(
"record[0]"
,
table
->
record
[
0
],
table
->
s
->
reclength
);
DBUG_DUMP
(
"record[0]"
,
(
const
char
*
)
table
->
record
[
0
],
table
->
s
->
reclength
);
DBUG_DUMP
(
"m_after_image"
,
m_after_image
,
table
->
s
->
reclength
);
DBUG_DUMP
(
"m_after_image"
,
(
const
char
*
)
m_after_image
,
table
->
s
->
reclength
);
/*
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment