database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Initail merge with MySQL 5.1 (XtraDB still needs to be merged)

Browse Source 
Fixed up copyright messages.
This commit is contained in:
Michael Widenius
2011-11-21 19:13:14 +02:00
parent 04f3ecf632 13fefeb04a
commit a8d03ab235
837 changed files with 11289 additions and 4591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_crypt.cc
View File

@ -1,4 +1,6 @@
/* Copyright (C) 2000-2001, 2003, 2005 MySQL AB
/*
Copyright (c) 2000, 2003, 2005, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
Use is subject to license terms.
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
@ -11,7 +13,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/