lp:~maria-captains/maria/10.0-wlad

Created by Vladislav Vaintroub on 2013-04-03 and last modified on 2013-04-03
Get this branch:
bzr branch lp:~maria-captains/maria/10.0-wlad
Members of Maria-captains can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Maria-captains
Project:
MariaDB
Status:
Development

Recent revisions

3508. By Vladislav Vaintroub on 2013-04-03

MDEV-4356

3507. By Sergei Golubchik on 2013-03-28

MDEV-4243 Warnings/errors while compiling with clang

3506. By Sergei Golubchik on 2013-03-28

MDEV-4207 Invalid code in fts_savepoint_release() in InnoDB

3505. By Alexander Barkov on 2013-03-28

Fixing test failure in the previous commit (utf16le merge from MySQL-5.6).
Recording new correct results in
  mysql-test/r/func_encrypt_ucs2.result

3504. By Alexander Barkov on 2013-03-28

Merging utf16le from MySQL-5.6

added:
  mysql-test/include/ctype_heap.inc
  mysql-test/include/ctype_strtoll10.inc
  mysql-test/r/ctype_utf16le.result
  mysql-test/t/ctype_utf16le.test
modified:
  cmake/character_sets.cmake
  include/m_ctype.h
  mysql-test/r/ctype_ucs.result
  mysql-test/r/ctype_utf16.result
  mysql-test/r/ctype_utf32.result
  mysql-test/suite/funcs_1/r/innodb_func_view.result
  mysql-test/suite/funcs_1/r/memory_func_view.result
  mysql-test/suite/funcs_1/r/myisam_func_view.result
  mysql-test/suite/sys_vars/r/character_set_client_basic.result
  mysql-test/suite/sys_vars/r/character_set_connection_basic.result
  mysql-test/suite/sys_vars/r/character_set_database_basic.result
  mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
  mysql-test/suite/sys_vars/r/character_set_results_basic.result
  mysql-test/t/ctype_ucs.test
  mysql-test/t/ctype_utf16.test
  mysql-test/t/ctype_utf32.test
  mysys/charset-def.c
  sql/item_func.cc
  sql/sys_vars.cc
  strings/ctype-latin1.c
  strings/ctype-ucs2.c

3503. By Vladislav Vaintroub on 2013-02-19

MDEV-156 Threadpool - add thd_wait_begin/thd_wait_end to the network IO functions

3502. By Michael Widenius on 2013-02-15

Automatic merge

3501. By Oleksandr "Sanja" Byelkin on 2013-02-04

merge

3500. By Sergey Petrunia on 2013-02-04

Skip cassandra_qcache.test if there is no Cassandra cluster running.

3499. By Sergey Petrunia on 2013-02-04

Merge fix for MDEV-3997.

Branch metadata

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

Subscribers