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

Merge mysql.com:/home/bar/mysql-work/mysql-5.0-rpl

Browse Source 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl


strings/conf_to_src.c:
  Auto merged
strings/ctype-extra.c:
  After merge fix
This commit is contained in:
unknown
2007-07-05 11:38:58 +05:00
parent 3598eca60f 32bdbc6d85
commit 31d750bf88
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
strings/conf_to_src.c
View File

@@ -243,6 +243,28 @@ void dispcset(FILE *f,CHARSET_INFO *cs)
} }
static void
fprint_copyright(FILE *file)
{
fprintf(file,
"/* Copyright (C) 2000-2007 MySQL AB\n"
"\n"
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms of the GNU General Public License as published by\n"
" the Free Software Foundation; version 2 of the License.\n"
"\n"
" This program is distributed in the hope that it will be useful,\n"
" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
" GNU General Public License for more details.\n"
"\n"
" You should have received a copy of the GNU General Public License\n"
" along with this program; if not, write to the Free Software\n"
" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */\n"
"\n");
}
int int
main(int argc, char **argv __attribute__((unused))) main(int argc, char **argv __attribute__((unused)))
{ {
@@ -283,6 +305,7 @@ main(int argc, char **argv __attribute__((unused)))
"directory:\n"); "directory:\n");
fprintf(f, " ./conf_to_src ../sql/share/charsets/ > FILE\n"); fprintf(f, " ./conf_to_src ../sql/share/charsets/ > FILE\n");
fprintf(f, "*/\n\n"); fprintf(f, "*/\n\n");
fprint_copyright(f);
fprintf(f,"#include <my_global.h>\n"); fprintf(f,"#include <my_global.h>\n");
fprintf(f,"#include <m_ctype.h>\n\n"); fprintf(f,"#include <m_ctype.h>\n\n");

15
strings/ctype-extra.c
View File

@@ -6,6 +6,21 @@
./conf_to_src ../sql/share/charsets/ > FILE ./conf_to_src ../sql/share/charsets/ > FILE
*/ */
/* Copyright (C) 2000-2007 MySQL 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
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <my_global.h> #include <my_global.h>
#include <m_ctype.h> #include <m_ctype.h>