[MDEV-303] Merge new InnoDB into MariaDB 10.0 Created: 2012-05-16  Updated: 2012-09-18  Due: 2012-09-21  Resolved: 2012-09-18

Status: Closed
Project: MariaDB Server
Component/s: None
Fix Version/s: 10.0.0

Type: Task Priority: Blocker
Reporter: Colin Charles Assignee: Michael Widenius
Resolution: Fixed Votes: 0
Labels: None

Issue Links:
Blocks

 Description   

Monty is to start the merge of InnoDB into MariaDB 10.0.

Note that there is 5.6.5 m8 (http://dev.mysql.com/downloads/mysql/5.6.html) currently available as well as the spring labs release code-named G5 I guess that differs from what is available in 5.6.5 m8 (http://blogs.innodb.com/wp/2012/04/innodb-2012-spring-labs-release/). There are some features in the labs release that aren't in 5.6.5 m8 (like online DDL, more scalability improvements, etc - see the linked blog post). There is source (http://labs.mysql.com/) but maybe no public tree

 Comments   
Comment by Rasmus Johansson (Inactive) [ 2012-08-07 ]

maria-call 2012-08-12 08:11 < montywi> 10.0 merge is almost done; now only tests failing are some performance schema tables. Should be able to fix that tomorrow.

Comment by Rasmus Johansson (Inactive) [ 2012-08-07 ]

10.0 tree is here:
https://code.launchpad.net/~maria-captains/maria/10.0-monty

Comment by Rasmus Johansson (Inactive) [ 2012-08-07 ]

TODO for the tree regarding InnoDB, performance schema and some general things can be found here:
http://bazaar.launchpad.net/~maria-captains/maria/10.0-monty/view/head:/TODO

Comment by Michael Widenius [ 2012-08-08 ]

Status report:

  • Current tree is pushed as 10.0-monty.
  • All InnoDB tests and most other test pass.
  • Performance schema tests fails (that is what I am working on now).
  • In this tree there is a TODO file that explains the current state. From the TODO:

----------
State of MERGE between MariaDB 5.5 and MySQL 5.6.5

Featured copied/merged

  • storage/innodb/*
  • storage/perfschema
  • sql/share/errmsg-utf8.txt
  • All CF_XXX states in sql_class.h.
  • handler error messages.
  • Removed timestamp handling from all handler::write and handler::update
    methods.
  • Added PSI_CALLS to handler.cc

Features recoded

  • Better error messages
  • Added support of timestamps to ha_write and ha_update.

Fetures half done:

  • Support for TRANSACTION READ ONLY | READ WRITE
  • CF_XXX states added to init_update_queries() but not otherwise used.

Short time TODO:

  • Add support for TRANSACTION READ ONLY | READ WRITE in sql_yacc.yy
    (support for variable tx_read_only)
  • merge hostname.cc / hostname.h
  • add support for host_error()
  • Enable performance_schema.host_cache in scripts/mysql_system_tables.sql
  • Add full support for timestamp. (remove timestamp handling from ha_write())
    ---------
Comment by Rasmus Johansson (Inactive) [ 2012-09-10 ]

Adjusting timeline

Generated at Thu Feb 08 06:27:44 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.