Skip to content

Commit 29e0c00

Browse files
committed
Updated/added copyright headers
--BZR-- revision-id: [email protected] property-branch-nick: mysql-5.1 testament3-sha1: bb72121cb0a7c496a58f2c826997e9615b11eec7
2 parents e7d6f2e + 8c7e3aa commit 29e0c00

476 files changed

Lines changed: 9854 additions & 6483 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bzr-mysql/default.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[MYSQL]
2-
post_commit_to = "dbg_mysql_security@sun.com"
3-
post_push_to = "dbg_mysql_security@sun.com"
4-
tree_name = "mysql-5.1-security"
2+
post_commit_to = "[email protected].com"
3+
post_push_to = "[email protected].com"
4+
tree_name = "mysql-5.1"

.bzrfileids

1.14 KB
Binary file not shown.

.bzrignore

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*.core
1010
*.d
1111
*.da
12+
*.dir
1213
*.dll
1314
*.exe
1415
*.exp
@@ -30,22 +31,29 @@
3031
*.pdb
3132
*.reject
3233
*.res
34+
*.rule
3335
*.sbr
3436
*.so
3537
*.so.*
3638
*.spec
3739
*.user
3840
*.vcproj
3941
*.vcproj.cmake
42+
*.vcxproj
43+
*.vcxproj.filters
4044
*/*.dir/*
45+
*.dir
46+
Debug
47+
MySql.sdf
48+
Win32
4149
*/*_pure_*warnings
4250
*/.deps
4351
*/.libs/*
4452
*/.pure
4553
*/debug/*
4654
*/minsizerel/*
4755
*/release/*
48-
*/relwithdebinfo/*
56+
RelWithDebInfo
4957
*~
5058
.*.swp
5159
./CMakeCache.txt
@@ -607,6 +615,7 @@ include/mysql_h.ic
607615
include/mysql_version.h
608616
include/mysqld_ername.h
609617
include/mysqld_error.h
618+
include/mysqld_error.h.rule
610619
include/openssl
611620
include/readline
612621
include/readline/*.h
@@ -1879,7 +1888,9 @@ scripts/mysql_find_rows
18791888
scripts/mysql_fix_extensions
18801889
scripts/mysql_fix_privilege_tables
18811890
scripts/mysql_fix_privilege_tables.sql
1891+
scripts/mysql_fix_privilege_tables.sql.rule
18821892
scripts/mysql_fix_privilege_tables_sql.c
1893+
scripts/mysql_fix_privilege_tables_sql.c.rule
18831894
scripts/mysql_install_db
18841895
scripts/mysql_secure_installation
18851896
scripts/mysql_setpermission
@@ -2116,6 +2127,7 @@ sql/handlerton.cc
21162127
sql/html
21172128
sql/latex
21182129
sql/lex_hash.h
2130+
sql/lex_hash.h.rule
21192131
sql/link_sources
21202132
sql/max/*
21212133
sql/message.h
@@ -2147,6 +2159,7 @@ sql/sql_builtin.cc
21472159
sql/sql_select.cc.orig
21482160
sql/sql_yacc.cc
21492161
sql/sql_yacc.h
2162+
sql/sql_yacc.h.rule
21502163
sql/sql_yacc.output
21512164
sql/sql_yacc.yy.orig
21522165
sql/test_time

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -59,6 +59,7 @@ ADD_DEFINITIONS(-D__NT__)
5959

6060
IF(CYBOZU)
6161
ADD_DEFINITIONS(-DCYBOZU)
62+
ADD_DEFINITIONS(-DHAVE_UTF8_GENERAL_CS)
6263
ENDIF(CYBOZU)
6364

6465
IF(EXTRA_DEBUG)

0 commit comments

Comments
 (0)