Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1963 05/12/14 01:29:39 jani@stripped +27 -0
Merge jamppa@stripped:/home/bk/mysql-5.1-new
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
configure.in
1.320 05/12/14 01:29:19 jani@stripped +1 -0
Merged from 4.1
support-files/mysql.spec.sh
1.121 05/12/14 01:27:01 jani@stripped +0 -0
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt
1.38 05/12/14 01:27:01 jani@stripped +0 -0
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp
1.22 05/12/14 01:27:01 jani@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
1.97 05/12/14 01:27:01 jani@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
1.82 05/12/14 01:27:01 jani@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
1.42 05/12/14 01:27:00 jani@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
1.42 05/12/14 01:27:00 jani@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt
1.15 05/12/14 01:26:59 jani@stripped +0 -0
Auto merged
storage/ndb/include/ndb_version.h.in
1.6 05/12/14 01:26:59 jani@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
1.8 05/12/14 01:26:59 jani@stripped +0 -0
Auto merged
storage/innobase/srv/srv0start.c
1.89 05/12/14 01:26:59 jani@stripped +0 -0
Auto merged
storage/innobase/srv/srv0srv.c
1.95 05/12/14 01:26:59 jani@stripped +0 -0
Auto merged
storage/innobase/row/row0mysql.c
1.116 05/12/14 01:26:59 jani@stripped +0 -0
Auto merged
storage/innobase/row/row0ins.c
1.74 05/12/14 01:26:59 jani@stripped +0 -0
Auto merged
storage/innobase/rem/rem0cmp.c
1.31 05/12/14 01:26:59 jani@stripped +0 -0
Auto merged
storage/innobase/include/srv0srv.h
1.58 05/12/14 01:26:59 jani@stripped +0 -0
Auto merged
storage/innobase/include/rem0cmp.h
1.11 05/12/14 01:26:59 jani@stripped +0 -0
Auto merged
storage/innobase/include/os0file.h
1.42 05/12/14 01:26:58 jani@stripped +0 -0
Auto merged
storage/innobase/include/dict0load.h
1.11 05/12/14 01:26:58 jani@stripped +0 -0
Auto merged
storage/innobase/include/dict0dict.h
1.40 05/12/14 01:26:58 jani@stripped +0 -0
Auto merged
storage/innobase/dict/dict0load.c
1.43 05/12/14 01:26:58 jani@stripped +0 -0
Auto merged
storage/innobase/dict/dict0dict.c
1.73 05/12/14 01:26:58 jani@stripped +0 -0
Auto merged
sql/ha_innodb.cc
1.243 05/12/14 01:26:58 jani@stripped +0 -0
Auto merged
mysql-test/t/ndb_read_multi_range.test
1.7 05/12/14 01:26:57 jani@stripped +0 -0
Auto merged
mysql-test/t/innodb.test
1.121 05/12/14 01:26:57 jani@stripped +0 -0
Auto merged
mysql-test/r/innodb.result
1.152 05/12/14 01:26:57 jani@stripped +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jani
# Host: a193-229-222-105.elisa-laajakaista.fi
# Root: /home/my/bk/mysql-5.1-new/RESYNC
--- 1.319/configure.in 2005-12-13 19:46:28 +02:00
+++ 1.320/configure.in 2005-12-14 01:29:19 +02:00
@@ -14,6 +14,12 @@
# See the libtool docs for information on how to do shared lib versions.
SHARED_LIB_VERSION=15:0:0
+# ndb version
+NDB_VERSION_MAJOR=5
+NDB_VERSION_MINOR=0
+NDB_VERSION_BUILD=18
+NDB_VERSION_STATUS=""
+
# Set all version vars based on $VERSION. How do we do this more elegant ?
# Remember that regexps needs to quote [ and ] since this is run through m4
MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
| Thread |
|---|
| • bk commit into 5.1 tree (jani:1.1963) | jani | 14 Dec |
