[Commits] Rev 3796: Merge with 10.0-connect in lp:~maria-captains/maria/10.0

Alexander Barkov bar at mariadb.org
Thu Aug 15 12:35:31 EEST 2013


At lp:~maria-captains/maria/10.0

------------------------------------------------------------
revno: 3796 [merge]
revision-id: bar at mariadb.org-20130815093149-up72bff50wgoiaay
parent: sergii at pisem.net-20130814165641-8277qzeio5sf6ioe
parent: bertrandop at gmail.com-20130814140732-wf8u8j94z3sntn2a
committer: Alexander Barkov <bar at mariadb.org>
branch nick: maria-10.0
timestamp: Thu 2013-08-15 13:31:49 +0400
message:
  Merge with 10.0-connect
modified:
  storage/connect/colblk.cpp     colblk.cpp-20130118152118-8rznf4ulkgxm3gnq-1
  storage/connect/colblk.h       colblk.h-20130118152109-mmnrlp4ll8csqtqq-4
  storage/connect/connect.cc     connect.cc-20130118152127-2616haw0q36d4dmb-1
  storage/connect/connect.h      connect.h-20130118152109-mmnrlp4ll8csqtqq-5
  storage/connect/ha_connect.cc  ha_connect.cc-20130118152127-2616haw0q36d4dmb-2
  storage/connect/ha_connect.h   ha_connect.h-20130118152109-mmnrlp4ll8csqtqq-18
  storage/connect/macutil.cpp    macutil.cpp-20130118152118-8rznf4ulkgxm3gnq-11
  storage/connect/mycat.cc       mycat.cc-20130118152127-2616haw0q36d4dmb-3
  storage/connect/myconn.cpp     myconn.cpp-20130118152118-8rznf4ulkgxm3gnq-13
  storage/connect/mysql-test/connect/r/mysql.result mysql.result-20130221083142-a0nr79cdhaexrs2n-1
  storage/connect/mysql-test/connect/r/pivot.result pivot.result-20130511112059-bhzr08isihlr4y4n-1
  storage/connect/mysql-test/connect/r/xml.result xml.result-20130131134405-q3t9hon6smvycgjr-2
  storage/connect/mysql-test/connect/t/mysql.test mysql.test-20130221083142-a0nr79cdhaexrs2n-2
  storage/connect/odbconn.cpp    odbconn.cpp-20130118152118-8rznf4ulkgxm3gnq-15
  storage/connect/plgdbsem.h     plgdbsem.h-20130118152109-mmnrlp4ll8csqtqq-30
  storage/connect/reldef.cpp     reldef.cpp-20130118152118-8rznf4ulkgxm3gnq-18
  storage/connect/reldef.h       reldef.h-20130118152109-mmnrlp4ll8csqtqq-34
  storage/connect/tabfmt.cpp     tabfmt.cpp-20130118152118-8rznf4ulkgxm3gnq-22
  storage/connect/table.cpp      table.cpp-20130118152118-8rznf4ulkgxm3gnq-23
  storage/connect/tabmysql.cpp   tabmysql.cpp-20130118152118-8rznf4ulkgxm3gnq-26
  storage/connect/tabmysql.h     tabmysql.h-20130118152109-mmnrlp4ll8csqtqq-43
  storage/connect/tabodbc.h      tabodbc.h-20130118152109-mmnrlp4ll8csqtqq-44
  storage/connect/tabsys.cpp     tabsys.cpp-20130118152118-8rznf4ulkgxm3gnq-29
  storage/connect/tabtbl.cpp     tabtbl.cpp-20130118152118-8rznf4ulkgxm3gnq-30
  storage/connect/tabutil.cpp    tabutil.cpp-20130429115006-0ejhae6f11myj97c-3
  storage/connect/tabutil.h      tabutil.h-20130429115006-0ejhae6f11myj97c-4
  storage/connect/tabwmi.cpp     tabwmi.cpp-20130118152118-8rznf4ulkgxm3gnq-32
  storage/connect/valblk.cpp     valblk.cpp-20130118152118-8rznf4ulkgxm3gnq-34
  storage/connect/value.cpp      value.cpp-20130118152118-8rznf4ulkgxm3gnq-35
  storage/connect/value.h        value.h-20130118152109-mmnrlp4ll8csqtqq-53
  storage/connect/xindex.cpp     xindex.cpp-20130118152118-8rznf4ulkgxm3gnq-36
  storage/connect/xindex.h       xindex.h-20130118152109-mmnrlp4ll8csqtqq-54
  storage/connect/xtable.h       xtable.h-20130118152109-mmnrlp4ll8csqtqq-56

Diff too large for email (3582 lines, the limit is 1000).


More information about the commits mailing list