Skip to content

Commit 6576b2b

Browse files
gkodinovgkodinov
committed
auto-merged mysql-trunk->mysql-trunk-wl5924
2 parents 9bc8d5b + c89bab2 commit 6576b2b

570 files changed

Lines changed: 23880 additions & 6259 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.

‎CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ IF(BUILD_CONFIG)
103103
${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
104104
ENDIF()
105105

106+
#cmake on 64 bit windows doesn't set CMAKE_SYSTEM_PROCESSOR correctly
107+
SET(MYSQL_MACHINE_TYPE ${CMAKE_SYSTEM_PROCESSOR})
108+
109+
106110
# Include the platform-specific file. To allow exceptions, this code
107111
# looks for files in order of how specific they are. If there is, for
108112
# example, a generic Linux.cmake and a version-specific

‎README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ For the avoidance of doubt, this particular copy of the software
55
is released under the version 2 of the GNU General Public License.
66
MySQL is brought to you by Oracle.
77

8-
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
8+
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
99

1010
License information can be found in the COPYING file.
1111

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MYSQL_VERSION_MAJOR=5
22
MYSQL_VERSION_MINOR=6
33
MYSQL_VERSION_PATCH=6
4-
MYSQL_VERSION_EXTRA=-m8
4+
MYSQL_VERSION_EXTRA=-m9

‎client/mysql.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@ int main(int argc,char *argv[])
12971297
mysql_thread_id(&mysql), server_version_string(&mysql));
12981298
put_info((char*) glob_buffer.ptr(),INFO_INFO);
12991299

1300-
put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"), INFO_INFO);
1300+
put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"), INFO_INFO);
13011301

13021302
#ifdef HAVE_READLINE
13031303
initialize_readline((char*) my_progname);
@@ -1730,7 +1730,7 @@ static void usage(int version)
17301730

17311731
if (version)
17321732
return;
1733-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
1733+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
17341734
printf("Usage: %s [OPTIONS] [database]\n", my_progname);
17351735
my_print_help(my_long_options);
17361736
print_defaults("my", load_default_groups);

‎client/mysql_upgrade.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ get_one_option(int optid, const struct my_option *opt,
246246
case '?':
247247
printf("%s Ver %s Distrib %s, for %s (%s)\n",
248248
my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
249-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2010"));
249+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
250250
puts("MySQL utility for upgrading databases to new MySQL versions.\n");
251251
my_print_help(my_long_options);
252252
exit(0);

‎client/mysqladmin.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
706706
case ADMIN_VER:
707707
new_line=1;
708708
print_version();
709-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
709+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
710710
printf("Server version\t\t%s\n", mysql_get_server_info(mysql));
711711
printf("Protocol version\t%d\n", mysql_get_proto_info(mysql));
712712
printf("Connection\t\t%s\n",mysql_get_host_info(mysql));
@@ -1104,7 +1104,7 @@ static void print_version(void)
11041104
static void usage(void)
11051105
{
11061106
print_version();
1107-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
1107+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
11081108
puts("Administration program for the mysqld daemon.");
11091109
printf("Usage: %s [OPTIONS] command command....\n", my_progname);
11101110
my_print_help(my_long_options);

‎client/mysqlbinlog.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,7 @@ static void print_version()
14751475
static void usage()
14761476
{
14771477
print_version();
1478-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
1478+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
14791479
printf("\
14801480
Dumps a MySQL binary log in a format usable for viewing or for piping to\n\
14811481
the mysql command line client.\n\n");

‎client/mysqlcheck.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ static void print_version(void)
228228
static void usage(void)
229229
{
230230
print_version();
231-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
231+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
232232
puts("This program can be used to CHECK (-c, -m, -C), REPAIR (-r), ANALYZE (-a),");
233233
puts("or OPTIMIZE (-o) tables. Some of the options (like -e or -q) can be");
234234
puts("used at the same time. Not all options are supported by all storage engines.");

‎client/mysqldump.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ static void short_usage_sub(void)
612612
static void usage(void)
613613
{
614614
print_version();
615-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
615+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
616616
puts("Dumping structure and contents of MySQL databases and tables.");
617617
short_usage_sub();
618618
print_defaults("my",load_default_groups);

‎client/mysqlimport.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static void print_version(void)
203203
static void usage(void)
204204
{
205205
print_version();
206-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
206+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
207207
printf("\
208208
Loads tables from text files in various formats. The base name of the\n\
209209
text file must be the name of the table that should be used.\n\

0 commit comments

Comments
 (0)