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

Merge with 5.2.

Browse Source 
no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
This commit is contained in:
Michael Widenius
2011-12-11 11:34:44 +02:00
parent 3e2cb35e11 701c0f822a
commit 6d4224a31c
1166 changed files with 25635 additions and 15193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/std_data/checkDBI_DBD-mysql.pl
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl
# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, Oracle and/or its affiliates
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public

5
mysql-test/std_data/latin1.xml
View File

@@ -3,7 +3,8 @@
<charsets>
<copyright>
Copyright (C) 2009 Sun Microsystems, Inc
Copyright (c) 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
@@ -16,7 +17,7 @@
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
</copyright>
<charset name="latin1">