mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

mysql-5.5.32 merge

Browse source
This commit is contained in:
Sergei Golubchik 2013-07-16 19:09:54 +02:00
commit 005c7e5421
1489 changed files with 3083 additions and 1939 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/sql_string.h
View file

@ -2,8 +2,8 @@
#define SQL_STRING_INCLUDED
/*
Copyright (c) 2000, 2012, Oracle and/or its affiliates.
Copyright (c) 2008, 2011, Monty Program Ab
Copyright (c) 2000, 2013, Oracle and/or its affiliates.
Copyright (c) 2008, 2013, Monty Program Ab.
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
@ -311,6 +311,7 @@ public:
DBUG_ASSERT(!s.uses_buffer_owned_by(this));
free();
Ptr=s.Ptr ; str_length=s.str_length ; Alloced_length=s.Alloced_length;
str_charset=s.str_charset;
}
return *this;
}