lp:~stewart/drizzle/7.1-innodb-from-mysql-5.5.10

Created by Stewart Smith and last modified
Get this branch:
bzr branch lp:~stewart/drizzle/7.1-innodb-from-mysql-5.5.10
Only Stewart Smith can upload to this branch. If you are Stewart Smith please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Stewart Smith
Project:
Drizzle
Status:
Merged

Recent revisions

2552. By Stewart Smith

fix compiler warning on some compilers:
plugin/innobase/srv/srv0srv.cc: In function 'ulint srv_thread_has_reserved_slot(srv_thread_type)':
plugin/innobase/srv/srv0srv.cc:1075: error: comparison between signed and unsigned integer expressions [-Wsign-compare]

2551. By Stewart Smith

merge InnoDB from MySQL 5.5.10, which wasn't given a version number bump

2550. By Stewart Smith

Update innobase plugin to InnoDB 1.1.5 from MySQL 5.5.9

2549. By Drizzle Continuous Integration

modified:
  plugin/gearman_udf/function_map.cc
  plugin/gearman_udf/gearman_udf.cc
  plugin/gearman_udf/gman_do.cc
  plugin/gearman_udf/gman_servers_set.cc
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-05-21 Update for compiling Gearman support.

2548. By Brian Aker

Fix for calling current Gearman function, another for bad init of error variable, and finally a spurious return call.

2547. By Drizzle Continuous Integration

pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-05-02 bzr set-root-id

2546. By Drizzle Continuous Integration

modified:
  plugin/rabbitmq/rabbitmq_log.cc

2545. By Drizzle Continuous Integration

modified:
  drizzled/drizzled.cc
  drizzled/execute/scanner.l
pending merge tips: (use -v to see all merge revisions)
  Andrew Hutchings 2012-04-21 Merge in both of Andrew's patchs for 7.1

2544. By Drizzle Continuous Integration

added:
  tests/suite/regression/r/986455.result
  tests/suite/regression/t/986455.test
modified:
  .bzrignore
  drizzled/identifier/schema.cc
  drizzled/identifier/schema.h
  drizzled/identifier/table.cc
  drizzled/identifier/table.h
  drizzled/table/instance/base.cc
  drizzled/util/backtrace.cc
  drizzled/util/backtrace.h
  libdrizzle-1.0/t/drizzle_con_st.c
  libdrizzle/conn.cc
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-20 Fix for lp:986455

2543. By Drizzle Continuous Integration

modified:
  libdrizzle-1.0/t/drizzle_con_st.c
  libdrizzle/conn.cc
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-19 Clean up error messages on libdrizzle

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:drizzle
This branch contains Public information 
Everyone can see this information.

Subscribers