Applied Terje patch to wl7688

Author: bkandasa

.bzrignore

@@ -412,6 +412,8 @@ client/rpl_tblmap.cc
 client/rpl_utility.h
 client/rpl_utility.cc
 client/select_test
+client/sql_commands_system_data.h
+client/sql_commands_system_tables.h
 client/sql_const.h
 client/sql_string.cpp
 client/ssl_test

cmake/cpack_source_ignore_files.cmake

@@ -34,7 +34,6 @@ $\\\\.bz2
 /_CPack_Packages/
 scripts/make_binary_distribution$
 scripts/mysql_config$
-scripts/mysql_install_db$
 scripts/mysql_secure_installation$
 scripts/mysql_server_config$
 scripts/mysqld_multi$

packaging/rpm-fedora/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # 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
@@ -28,7 +28,7 @@ IF(UNIX)
 
   FOREACH(fedfile my.cnf my_config.h mysql_config.sh
           mysqld.service mysql-systemd-start mysql.conf
-          mysql-5.6.16-mysql-install.patch mysql-5.7-libmysqlclient-symbols.patch)
+          mysql-5.7-libmysqlclient-symbols.patch)
     CONFIGURE_FILE(${fedfile} ${CMAKE_CURRENT_BINARY_DIR}/${fedfile} COPYONLY)
   ENDFOREACH()
 ENDIF()

packaging/rpm-fedora/mysql-5.6.16-mysql-install.patch

@@ -27,7 +27,7 @@ install_db () {
     [ -d "$datadir/mysql" ] && exit 0
 
     # Create initial db
-    /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
+    /usr/bin/mysql_install_db --datadir="$datadir" --user=mysql
     exit 0
 }
 

packaging/rpm-fedora/mysql-systemd-start

@@ -75,7 +75,6 @@ Source3:        mysql.conf
 Source4:        my_config.h
 Source6:        mysql_config.sh
 Patch0:         mysql-5.7-libmysqlclient-symbols.patch
-Patch1:         mysql-5.6.16-mysql-install.patch
 BuildRequires:  cmake
 BuildRequires:  perl
 BuildRequires:  time
@@ -308,7 +307,6 @@ the embedded version of the MySQL server.
 %setup -q -T -a 0 -c -n %{src_dir}
 pushd %{src_dir}
 %patch0 -p1
-#patch1 -p1
 
 %build
 # Fail quickly and obviously if user tries to build as root

packaging/rpm-fedora/mysql.spec.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # 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
@@ -28,8 +28,7 @@ IF(UNIX)
 
   FOREACH(fedfile my.cnf my_config.h mysql_config.sh
           mysqld.service mysql-systemd-start mysql.conf
-          mysql-5.6.16-mysql-install.patch mysql.init
-          filter-requires.sh filter-provides.sh
+          mysql.init filter-requires.sh filter-provides.sh
           mysql-5.7-libmysqlclient-symbols.patch)
     CONFIGURE_FILE(${fedfile} ${CMAKE_CURRENT_BINARY_DIR}/${fedfile} COPYONLY)
   ENDFOREACH()