summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-03-18 03:19:20 +0200
committerunknown <monty@narttu.mysql.fi>2003-03-18 03:19:20 +0200
commit21b0873a3ce5ee079b120199eb0423bdcff78c22 (patch)
treeda8cf393b1fa3a8b2096289ccb606a372e734759 /innobase
parent53bb7b6801d19a275933b4ec8308823699c30fbd (diff)
parentcf97cbd1db762c443aa3c1412f3e788559aaa5dd (diff)
downloadmariadb-git-21b0873a3ce5ee079b120199eb0423bdcff78c22.tar.gz
Merge with 3.23 to get fix for halloween problem on Update of InnoDB tables
innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged sql/key.cc: Auto merged configure.in: Merge with 3.23 mysql-test/r/innodb.result: Merge with 3.23 mysql-test/t/innodb.test: Merge with 3.23 strings/strto.c: Merge with 3.23
Diffstat (limited to 'innobase')
-rw-r--r--innobase/row/row0mysql.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c
index ba56b3071cd..0ca1a7516e0 100644
--- a/innobase/row/row0mysql.c
+++ b/innobase/row/row0mysql.c
@@ -6,7 +6,7 @@ Contains also create table and other data dictionary operations.
Created 9/17/2000 Heikki Tuuri
*******************************************************/
-
+
#include "row0mysql.h"
#ifdef UNIV_NONINL