database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

weave merge from mysql-5.1 to mysql-5.5

Browse Source 
Resolved an innodb conflict thanks to vasil.
This commit is contained in:
Georgi Kodinov
2011-02-08 17:47:33 +02:00
parent e98c722825 94097ecd56
commit 1c32b8ee3c
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_pthread.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
/* Copyright (c) 2000, 2011, 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