diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 14:06:11 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 14:06:11 -0400 |
| commit | ec91eea8dbae4276ff6e31a0d80c0b523f88ed88 (patch) | |
| tree | 8d1b9adecf56764c4198a42c3df6dbb1096ce49a /mysys | |
| parent | e4e55f7968d961e0cb07800397bc3108f960956a (diff) | |
| parent | c722e5f25f1f00b32f9b4b556f07489bda38095a (diff) | |
| download | mariadb-git-ec91eea8dbae4276ff6e31a0d80c0b523f88ed88.tar.gz | |
Local merge of mariadb-5.5.39
bzr merge -r4264 maria/5.5
Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | mysys/mf_iocache2.c | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index e0f2de4a61b..06a811f0994 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2013, Oracle and/or its affiliates +# Copyright (c) 2006, 2014, Oracle and/or its affiliates # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -87,7 +87,6 @@ ADD_EXECUTABLE(thr_lock thr_lock.c) TARGET_LINK_LIBRARIES(thr_lock mysys) SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN") -INSTALL_DEBUG_SYMBOLS(mysys) IF(MSVC) INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index c447c4b44a1..c9bec6f1f5d 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -456,6 +456,13 @@ process_flags: goto err; } } + else if (*fmt == 'c') /* char type parameter */ + { + char par[2]; + par[0] = va_arg(args, int); + if (my_b_write(info, (uchar*) par, 1)) + goto err; + } else if (*fmt == 'b') /* Sized buffer parameter, only precision makes sense */ { char *par = va_arg(args, char *); |