Vasil Dimov
ef5b7c2e89
Merge from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3422
revision-id: marko.makela@oracle.com-20100427134738-1poi5n4hn29ndne5
parent: marko.makela@oracle.com-20100426131029-1ffja69h6n88q6bo
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Tue 2010-04-27 16:47:38 +0300
message:
row_merge_drop_temp_indexes(): Remove a bogus char-to-ulint cast.
modified:
storage/innodb_plugin/row/row0merge.c 1414@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Frow%2Frow0merge.c
------------------------------------------------------------
2010-05-04 13:21:33 +03:00
Vasil Dimov
5f9ba24f91
Import branches/innodb+ from SVN on top of storage/innobase.
2010-04-12 18:20:41 +03:00
Alexander Nozdrin
69cfd5c8ec
Manual merge from mysql-trunk.
...
Conflicts:
- client/mysqltest.cc
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/disabled.def
- sql/mysqld.cc
- sql/opt_range.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_partition.cc
- sql/sql_table.cc
2009-12-11 12:39:38 +03:00
Satya B
57f7f1fdf3
Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mysql-trunk-merge.
...
Merging revisions 3221 to 3230 from mysql-5.1-bugteam
2009-12-02 19:30:50 +05:30
Alexander Nozdrin
069d78c067
Merge from mysql-next-mr.
2009-10-23 15:22:21 +04:00
Satya B
a0e12ec269
Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163
...
also merged missing Innodb plugin revisions r5636,r5635 manually
2009-10-16 17:28:02 +05:30
Konstantin Osipov
4db335dcee
Backport of:
...
----------------------------------------------------------
revno: 2630.22.8
committer: Konstantin Osipov <konstantin@mysql.com >
branch nick: mysql-6.0-runtime
timestamp: Sun 2008-08-10 18:49:52 +0400
message:
Get rid of typedef struct for the most commonly used types:
TABLE, TABLE_SHARE, LEX. This simplifies use of tags
and forward declarations.
2009-10-14 15:14:58 +04:00
Guilhem Bichot
29a46b4cf9
Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same
...
layout as we always had in trees containing only the builtin
2) win\configure.js WITH_INNOBASE_STORAGE_ENGINE still works.
2009-08-07 12:16:00 +02:00
