Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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@stripped, 2007-07-06 22:44:53+02:00, tomas@stripped +3 -0
WL#3627 new version number
mysql-test/r/ndb_column_properties.result@stripped, 2007-07-06 22:44:50+02:00, tomas@stripped +82 -82
WL#3627 new version number
sql/table.cc@stripped, 2007-07-06 22:44:50+02:00, tomas@stripped +1 -1
WL#3627 new version number
sql/unireg.h@stripped, 2007-07-06 22:44:50+02:00, tomas@stripped +2 -2
WL#3627 new version number
# 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: tomas
# Host: whalegate.ndb.mysql.com
# Root: /home/tomas/mysql-5.1-tmp
--- 1.291/sql/table.cc 2007-07-05 14:54:39 +02:00
+++ 1.292/sql/table.cc 2007-07-06 22:44:50 +02:00
@@ -789,7 +789,7 @@
if (share->mysql_version >= MYSQL_VERSION_TABLESPACE_IN_FRM)
{
/*
- New frm format in mysql_version 5.1.19
+ New frm format in mysql_version 5.1.20
New column properties added:
COLUMN_FORMAT DYNAMIC|FIXED and STORAGE DISK|MEMORY
TABLESPACE name is now stored in frm
--- 1.54/sql/unireg.h 2007-06-13 20:20:21 +02:00
+++ 1.55/sql/unireg.h 2007-07-06 22:44:50 +02:00
@@ -157,8 +157,8 @@
#define MTYP_NOEMPTY_BIT 128
#define FRM_VER_TRUE_VARCHAR (FRM_VER+4) /* 10 */
-#define MYSQL_VERSION_TABLESPACE_IN_FRM 50119
-#define MYSQL_VERSION_TABLESPACE_IN_FRM_STR "50119"
+#define MYSQL_VERSION_TABLESPACE_IN_FRM 50120
+#define MYSQL_VERSION_TABLESPACE_IN_FRM_STR "50120"
/*
Minimum length pattern before Turbo Boyer-Moore is used
--- 1.4/mysql-test/r/ndb_column_properties.result 2007-07-05 13:48:57 +02:00
+++ 1.5/mysql-test/r/ndb_column_properties.result 2007-07-06 22:44:50 +02:00
@@ -19,7 +19,7 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` int(11) /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL
+ `a` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
a Int NULL AT=FIXED ST=DISK
$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
@@ -49,18 +49,18 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` int(11) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `a1` int(11) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `b` int(11) NOT NULL /*!50119 COLUMN_FORMAT DYNAMIC */,
- `b1` int(11) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT FIXED */,
- `c` varchar(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `c1` varchar(100) /*!50119 STORAGE MEMORY */ /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `d` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `d1` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT DYNAMIC */,
- `e` char(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `e1` char(100) /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `f` char(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `f1` char(100) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT DYNAMIC */,
+ `a` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `b` int(11) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */,
+ `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
select column_name, storage, format from information_schema.columns
@@ -84,18 +84,18 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` int(11) /*!50119 STORAGE DISK */ DEFAULT NULL,
- `a1` int(11) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `b` int(11) NOT NULL /*!50119 COLUMN_FORMAT DYNAMIC */,
- `b1` int(11) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT FIXED */,
- `c` varchar(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `c1` varchar(100) /*!50119 STORAGE MEMORY */ /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `d` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `d1` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT DYNAMIC */,
- `e` char(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `e1` char(100) /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `f` char(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `f1` char(100) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT DYNAMIC */,
+ `a` int(11) /*!50120 STORAGE DISK */ DEFAULT NULL,
+ `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `b` int(11) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */,
+ `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
a Int NULL AT=FIXED ST=DISK
@@ -117,18 +117,18 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` int(11) /*!50119 STORAGE MEMORY */ DEFAULT NULL,
- `a1` int(11) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `b` int(11) NOT NULL /*!50119 COLUMN_FORMAT DYNAMIC */,
- `b1` int(11) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT FIXED */,
- `c` varchar(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `c1` varchar(100) /*!50119 STORAGE MEMORY */ /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `d` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `d1` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT DYNAMIC */,
- `e` char(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `e1` char(100) /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `f` char(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `f1` char(100) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT DYNAMIC */,
+ `a` int(11) /*!50120 STORAGE MEMORY */ DEFAULT NULL,
+ `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `b` int(11) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */,
+ `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
a Int NULL AT=FIXED ST=MEMORY
@@ -153,19 +153,19 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` int(11) /*!50119 STORAGE MEMORY */ DEFAULT NULL,
- `a1` int(11) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `b` int(11) NOT NULL /*!50119 STORAGE MEMORY */,
- `b1` int(11) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT FIXED */,
- `c` varchar(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `c1` varchar(100) /*!50119 STORAGE MEMORY */ /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `d` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `d1` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT DYNAMIC */,
- `e` char(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `e1` char(100) /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `f` char(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `f1` char(100) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT DYNAMIC */,
- `a2` int(11) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `a` int(11) /*!50120 STORAGE MEMORY */ DEFAULT NULL,
+ `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `b` int(11) NOT NULL /*!50120 STORAGE MEMORY */,
+ `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */,
+ `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `a2` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
a Int NULL AT=FIXED ST=MEMORY
@@ -188,20 +188,20 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` int(11) /*!50119 STORAGE MEMORY */ DEFAULT NULL,
- `a1` int(11) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `b` int(11) NOT NULL /*!50119 STORAGE MEMORY */,
- `b1` int(11) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT FIXED */,
- `c` varchar(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `c1` varchar(100) /*!50119 STORAGE MEMORY */ /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `d` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `d1` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT DYNAMIC */,
- `e` char(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `e1` char(100) /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `f` char(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `f1` char(100) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT DYNAMIC */,
- `a2` int(11) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `c2` varchar(100) /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `a` int(11) /*!50120 STORAGE MEMORY */ DEFAULT NULL,
+ `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `b` int(11) NOT NULL /*!50120 STORAGE MEMORY */,
+ `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */,
+ `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `a2` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `c2` varchar(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
a Int NULL AT=FIXED ST=MEMORY
@@ -225,21 +225,21 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` int(11) /*!50119 STORAGE MEMORY */ DEFAULT NULL,
- `a1` int(11) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `b` int(11) NOT NULL /*!50119 STORAGE MEMORY */,
- `b1` int(11) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT FIXED */,
- `c` varchar(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `c1` varchar(100) /*!50119 STORAGE MEMORY */ /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `d` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `d1` varchar(100) NOT NULL /*!50119 COLUMN_FORMAT DYNAMIC */,
- `e` char(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `e1` char(100) /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `f` char(100) NOT NULL /*!50119 COLUMN_FORMAT FIXED */,
- `f1` char(100) NOT NULL /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT DYNAMIC */,
- `a2` int(11) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `c2` varchar(100) /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
- `c3` varchar(100) /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `a` int(11) /*!50120 STORAGE MEMORY */ DEFAULT NULL,
+ `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `b` int(11) NOT NULL /*!50120 STORAGE MEMORY */,
+ `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */,
+ `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */,
+ `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */,
+ `a2` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `c2` varchar(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
+ `c3` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
a Int NULL AT=FIXED ST=MEMORY
@@ -264,7 +264,7 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` int(11) /*!50119 STORAGE MEMORY */ /*!50119 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL
+ `a` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
a Int NULL AT=FIXED ST=MEMORY DYNAMIC
$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
@@ -273,8 +273,8 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `column_format` int(11) /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL,
- `storage` int(11) /*!50119 STORAGE DISK */ /*!50119 COLUMN_FORMAT FIXED */ DEFAULT NULL
+ `column_format` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
+ `storage` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
column_format Int NULL AT=FIXED ST=DISK
storage Int NULL AT=FIXED ST=DISK
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2574) | tomas | 7 Jul |
