Commit graph

136 commits

Author SHA1 Message Date
Alexander Nozdrin
5867d275a3 Manual merge from mysql-trunk-merge.
Conflicts:
  - sql/share/Makefile.am
2010-03-01 12:39:44 +03:00
Alexey Kopytov
84766b060a Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
2010-02-26 16:06:31 +03:00
Georgi Kodinov
792fc9f784 Bug #35250: readline check breaks when doing vpath build
Fixed several (obvious) places that don't work with vpath
build.
2010-02-12 18:28:35 +02:00
Vladislav Vaintroub
4d49915cf2 Remove support for "make install" DESTDIR - did not work as expected 2010-01-14 14:54:32 +01:00
Vladislav Vaintroub
50d56f0906 Delay configuring scripts like mysql_install_db until CPack runs
(to handle DESTDIR correctly)
2009-11-26 18:40:45 +01:00
Joerg Bruehe
29d0fa12f7 This is the 5.4 version of the fix for bug#47007
Unresolved reference to 'innodb_system_libs' in "mysql_config"

In 5.4.2, we use InnoDB 1.0.4 which does file IO via separate
threads, opposed to the use of asynchronous IO previously.

So there is no InnoDB call to "aio_read()" which was searched
in "librt", causing a "-lrt" value of "innodb_system_libs",
that whole variable is gone.

This fix was applied in the build of 5.4.2-beta.

scripts/Makefile.am:
  There is no "innodb_system_libs" variable any more,
  so it cannot be replaced by its value.
scripts/mysql_config.pl.in:
  InnoDB does not need any platform-specific libraries any more,
  "innodb_system_libs" may go.
scripts/mysql_config.sh:
  InnoDB does not need any platform-specific libraries any more,
  "innodb_system_libs" may go.
2009-09-08 15:35:01 +02:00
Mikael Ronstrom
5e9d1e8109 Merge dtrace patch with latest performance version 2008-12-20 11:53:27 +01:00
Mikael Ronstrom
cc958a18dd Backport of DTrace patches from 6.0 2008-12-20 11:01:41 +01:00
Tatiana A. Nurnberg
c5da8fbe16 Bug#34025: mysql_config is not returning -ldl lib flag needed when using embedded server
mysql_config did not output -ldl (or equivalent) when needed for --libmysqld-libs,
so its output could be insufficient to build an application using the embedded
server.

LIBDL was already set in configure; it's now propagated all the way into the
relevant mysql_config scripts.

scripts/Makefile.am:
  We "manually" replace configure's constants in .sh scripts using sed,
  so AC_SUBST() alone is not good enough. Add LIBDL to the substitution
  list; we'll be needing it for mysql_config --libmysqld-libs
scripts/mysql_config.pl.in:
  Add LIBDL (usually -ldl) to output of mysql_config --libmysqld-libs (perl version)
scripts/mysql_config.sh:
  Add LIBDL (usually -ldl) to output of mysql_config --libmysqld-libs (shell version)
2008-11-10 22:12:15 +01:00
unknown
fcdf0d11c5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1


libmysqld/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/unireg.h:
  Auto merged
2008-03-06 15:13:14 +00:00
unknown
4f5658cb0b Makefile.am, CMakeLists.txt, make_win_bin_dist:
Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"


scripts/CMakeLists.txt:
  Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"
scripts/Makefile.am:
  Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"
scripts/make_win_bin_dist:
  Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"
2008-01-31 20:55:58 +01:00
unknown
db4aee18bd Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/bug-31736-5.1
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/bug-31736/5.1


scripts/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
2008-01-08 14:04:03 +00:00
unknown
7b26e7774c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


scripts/CMakeLists.txt:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/make_win_bin_dist:
  Auto merged
2008-01-02 22:26:41 +01:00
unknown
ad367fe00a Use pkglibdir to simplify pkgplugindir, and fix the path in a
couple of Makefiles.  Continuation of the fix for bug#31736.


libmysqld/Makefile.am:
  Use pkglibdir
plugin/daemon_example/Makefile.am:
  Use pkglibdir
plugin/fulltext/Makefile.am:
  Use pkglibdir
scripts/Makefile.am:
  Use pkglibdir
scripts/make_binary_distribution.sh:
  Update comment
sql/Makefile.am:
  Use pkglibdir
storage/archive/Makefile.am:
  Use pkglibdir
storage/blackhole/Makefile.am:
  Use pkglibdir
storage/example/Makefile.am:
  Use pkglibdir, fix pkgplugindir
storage/federated/Makefile.am:
  Use pkglibdir
storage/innobase/Makefile.am:
  Use pkglibdir, fix pkgplugindir
2008-01-02 13:00:46 +00:00
unknown
7e65653983 Makefile.am, CMakeLists.txt, mysql_secure_installation.pl.in:
Added Perl version of script "mysql_secure_installation"
make_win_bin_dist:
  Corrected copy of SQL files to "share" directory


scripts/mysql_secure_installation.pl.in:
  Added Perl version of script "mysql_secure_installation"
scripts/CMakeLists.txt:
  Added Perl version of script "mysql_secure_installation"
scripts/Makefile.am:
  Added Perl version of script "mysql_secure_installation"
scripts/make_win_bin_dist:
  Corrected copy of SQL files to "share" directory
2007-12-28 22:58:54 +01:00
unknown
1e41f36c56 Merge mysql.com:/home/kent/bk/windows-cleanup/mysql-5.0-build
into  mysql.com:/home/kent/bk/windows-cleanup/mysql-5.1-build


extra/CMakeLists.txt:
  Auto merged
extra/resolveip.c:
  Auto merged
scripts/CMakeLists.txt:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/make_win_bin_dist:
  Auto merged
scripts/mysql_convert_table_format.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
BitKeeper/deleted/.del-mysql_tableinfo.sh~c715458838a2a818:
  Auto merged
2007-12-28 01:07:42 +01:00
unknown
471437fd47 make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
Better Windows support in the scripts directory
mysql_config.pl.in, mysql_install_db.pl.in:
  New Perl version of Unix shell script, mainly for Windows
Many files in scripts directory:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path


extra/CMakeLists.txt:
  Added target for executable "resolveip"
extra/resolveip.c:
  Exclude Unix specific headers when compiling on Windows
scripts/CMakeLists.txt:
  On Windows, filter Perl scripts and change name from ".sh" to ".pl"
  
    mysql_convert_table_format.sh  mysql_explain_log.sh
    mysql_secure_installation.sh   mysql_tableinfo.sh
    mysqld_multi.sh                mysqldumpslow.sh
    mysqlhotcopy.sh
  
  Do the same for the new Windows specific Perl versions of shell scripts
  
    mysql_config.pl.in             mysql_install_db.pl.in
  
  In CMake, set reasonable values for 'CFLAGS', 'prefix', 'datadir' and so on.
scripts/Makefile.am:
  Include "mysql_config.pl.in" and "mysql_install_db.pl.in" in the source TAR
scripts/make_win_bin_dist:
  Only include explicitly listed scripts from the "scripts" directory
scripts/mysql_convert_table_format.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_explain_log.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_tableinfo.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqld_multi.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqldumpslow.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqlhotcopy.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_config.pl.in:
  New Perl version of Unix shell script, mainly for Windows
scripts/mysql_install_db.pl.in:
  New Perl version of Unix shell script, mainly for Windows
2007-12-28 01:02:28 +01:00
unknown
92e31e96a2 Add new pkgplugindir handling to seperate plugins from libraries,
and allow override for binary distributions.  Extend mysql_config
to print compiled-in plugin location for third-party plugins to
use.  Resolves bug#31736.


libmysqld/Makefile.am:
  Use pkgplugindir.
plugin/daemon_example/Makefile.am:
  Use pkgplugindir.
plugin/fulltext/Makefile.am:
  Use pkgplugindir.
scripts/Makefile.am:
  Add pkgplugindir.
scripts/make_binary_distribution.sh:
  Add pkgplugindir.
scripts/mysql_config.sh:
  Add pkgplugindir.
sql/Makefile.am:
  Use pkgplugindir.
sql/mysqld.cc:
  Use PLUGINDIR, derived from pkgplugindir, instead of
  LIBDIR for plugins.
sql/unireg.h:
  Use PLUGINDIR instead of LIBDIR, and define to be the
  default setting of pkgplugindir.
storage/innobase/Makefile.am:
  Use pkgplugindir.
storage/archive/Makefile.am:
  Use pkgplugindir.
storage/blackhole/Makefile.am:
  Use pkgplugindir.
storage/example/Makefile.am:
  Use pkgplugindir.
storage/federated/Makefile.am:
  Use pkgplugindir.
2007-12-19 13:24:43 +00:00
unknown
2436d13f33 Merge trift2.:/MySQL/M51/bug31644-5.1
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
scripts/Makefile.am:
  Auto merged
2007-10-19 19:22:27 +02:00
unknown
f3eed850c7 Merge trift2.:/MySQL/M50/bug31644-5.0
into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
scripts/Makefile.am:
  Auto merged
2007-10-19 19:19:15 +02:00
unknown
6f5da0a989 Merge trift2.:/MySQL/M50/bug31644-5.0
into  trift2.:/MySQL/M51/bug31644-5.1


configure.in:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysqlbug.sh:
  Auto merged
2007-10-19 19:06:30 +02:00
unknown
a9624698be Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original
and the modified values of the compile-related variables used in "configure".

Make the necessary adjustments in "configure.in" and "scripts/Makefile.am".

This fixes bug#31644
   Values of *FLAGS that were used for building packages is missed in mysqlbug


configure.in:
  Add more variables to the "substitution" list: SAVE_CC, SAVE_CXX, ASFLAGS.
  
  This is necessary so that the "mysqlbug" script can output the variables affecting
  compilation with both their original (on call) and final (modified) values.
  
  This work is related to fixing bug#31644
     Values of *FLAGS that were used for building packages is missed in mysqlbug
scripts/Makefile.am:
  Clearly differ between the original and the modified values of the compile-related
  variables used in "configure".
  
  This is to fix bug#31644
     Values of *FLAGS that were used for building packages is missed in mysqlbug
scripts/mysqlbug.sh:
  Have separate variables "COMP_CALL_INFO" and "COMP_RUN_INFO"
  which contain the original (call parameters, environment) and the modified values
  of the "configure" variables controlling the compile process.
  
  This fixes bug#31644
     Values of *FLAGS that were used for building packages is missed in mysqlbug
2007-10-18 12:03:30 +02:00
unknown
17c19299af Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
2007-10-10 14:15:09 -06:00
unknown
3e95b39882 Makefile.am, make_binary_distribution.sh:
Use custom 'pkgduppdir'
mysql.server.sh:
  The server is installed in 'libexecdir'


scripts/Makefile.am:
  Use custom 'pkgduppdir'
scripts/make_binary_distribution.sh:
  Use custom 'pkgduppdir'
support-files/mysql.server.sh:
  The server is installed in 'libexecdir'
2007-09-27 12:21:56 +02:00
unknown
16c09e69f6 make_binary_distribution.sh:
Use 'make install' to create the package
Makefile.am:
  Added 'pkgsuppdir' to control location separately
  Pass on mandir and infodir
  Don't install headers


scripts/Makefile.am:
  Pass on mandir and infodir
scripts/make_binary_distribution.sh:
  Use 'make install' to create the package
support-files/Makefile.am:
  Added 'pkgsuppdir' to control location separately
cmd-line-utils/readline/Makefile.am:
  Don't install headers
cmd-line-utils/libedit/Makefile.am:
  Don't install headers
2007-09-26 20:19:33 +02:00
unknown
613f7ff3b5 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/tnurnberg/15327/50-15327


client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2007-09-15 04:45:20 +02:00
unknown
682c22846f Merge mysql.com:/home/tnurnberg/15327/50-15327
into  mysql.com:/home/tnurnberg/15327/51-15327


BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
  Auto merged
BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
server-tools/instance-manager/priv.h:
  Auto merged
client/mysql.cc:
  manual merge
client/mysqladmin.cc:
  manual merge
client/mysqlbinlog.cc:
  manual merge
client/mysqlcheck.c:
  manual merge
client/mysqldump.c:
  manual merge
client/mysqlimport.c:
  manual merge
client/mysqlshow.c:
  manual merge
client/mysqltest.c:
  manual merge
sql/mysqld.cc:
  manual merge
tests/mysql_client_test.c:
  manual merge
tests/thread_test.c:
  manual merge
2007-09-15 04:09:38 +02:00
unknown
ee7f125d5f Bug #15327: configure: --with-tcp-port option being partially ignored
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)


client/mysql.cc:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
client/mysql_upgrade.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
client/mysqladmin.cc:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
client/mysqlbinlog.cc:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
client/mysqlcheck.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
client/mysqldump.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
client/mysqlimport.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
client/mysqlmanagerc.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
configure.in:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  If MYSQL_TCP_PORT defaulted in configure (factory default 3306
  at the time of this writing), set MYSQL_TCP_PORT to factory
  default, then clear factory default after. That way, we lose no
  information, and we can distinguish between "defaulted" and the
  pathological case "builder specifically configured a port that
  coincides with factory default." This can in theory happen if
  builder configures and builds several servers from a script
  (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
  Not all that probable, but much preferable to having more "magic"
  happen in the server when we can solve this without any guesswork.
client/mysqlshow.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
client/mysqltest.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
include/mysql_version.h.in:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make factory default for TCP port available as MYSQL_PORT_DEFAULT
  if build-time configured with a different default.  (0 if unchanged)
libmysql/libmysql.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  initialize default tcp port for client, like so:
  - if user configured --with-tcp-port, use that value as default
  - otherwise assume "use a good default": search mysqld/tcp in
    /etc/services; if that doesn't exist, use factory default (3306)
  - environment variable MYSQL_TCP_PORT overrides this default
  - command-line option overrides all of the above
mysql-test/Makefile.am:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
  if build-time configured with a different default.  (0 if unchanged)
mysql-test/mysql-test-run-shell.sh:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  set up MYSQL_TCP_PORT if not already set in environment:
  - if user configured --with-tcp-port, use that value as default
  - otherwise assume "use a good default": search mysqld/tcp in
    /etc/services; if that doesn't exist, use factory default (3306)
netware/mysql_test_run.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  account for non-standard default port-no. configured at build-time
netware/mysqld_safe.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  account for non-standard default port-no. configured at build-time
scripts/Makefile.am:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
  if build-time configured with a different default.  (0 if unchanged)
scripts/mysql_config.sh:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  set up MYSQL_TCP_PORT if not already set in environment:
  - if user configured --with-tcp-port, use that value as default
  - otherwise assume "use a good default": search mysqld/tcp in
    /etc/services; if that doesn't exist, use factory default (3306)
scripts/mysql_fix_privilege_tables.sh:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  clarifying notice only
scripts/mysqld_safe-watch.sh:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  account for non-standard default port-no. configured at build-time
server-tools/instance-manager/priv.h:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  account for non-standard default port-no. configured at build-time
sql/mysqld.cc:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  if builder specifically requested a default port, use that
  (even if it coincides with our factory default).
  only if they didn't do we check /etc/services (and, failing
  on that, fall back to the factory default of 3306).
  either default can be overridden by the environment variable
  MYSQL_TCP_PORT, which in turn can be overridden with command
  line options.
tests/mysql_client_test.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
tests/ssl_test.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  account for non-standard default port-no. configured at build-time
tests/thread_test.c:
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make help on --port a little more clear
2007-09-13 16:19:46 +02:00
unknown
e56a1eacc8 make_win_src_distribution_old.sh:
Rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution_old.sh
Makefile.am, make_win_src_distribution_old.sh:
  Rename and put in note not to be used


scripts/make_win_src_distribution_old.sh:
  Rename and put in note not to be used
scripts/Makefile.am:
  Rename and put in note not to be used
2007-08-14 00:03:05 +02:00
unknown
70d440ace3 Merge trift2.:/MySQL/M50/netware-cross-5.0
into  trift2.:/MySQL/M51/netware-cross-5.1


scripts/Makefile.am:
  Manual merge.
2007-05-03 18:08:06 +02:00
unknown
ad33a48afc Better distinction between "CLEANFILES" and "DISTCLEANFILES" for some generated files
(here: "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for cross-builds.


scripts/Makefile.am:
  Generated files like "mysql_fix_privilege_tables{.sql,_sql.c}" should survive
  a "make clean", this is essential for cross-builds.
  So move them from "CLEANFILES" to "DISTCLEANFILES".
2007-05-03 15:51:02 +02:00
unknown
2478a8be0c Resolve a possible timing issue with "scripts/mysql_fix_privilege_tables_sql.c" in the
source tarball, this is essential for cross builds, like for NetWare.


scripts/Makefile.am:
  On a fast build machine, both the source (mysql_fix_privilege_tables.sql) 
  and the generated file (mysql_fix_privilege_tables_sql.c) may have identical timestamps
  (granularity is one second only, may be too coarse).
  If that happens, the Makefile rule will fire, and "comp_sql" will be built and called -
  which fails in a cross build, like for NetWare.
  
  Prevent that by sleeping for 5 (five) seconds, this will ensure a time difference.
2007-05-02 20:07:01 +02:00
unknown
11b49c6c40 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


scripts/Makefile.am:
  Auto merged
2007-05-02 17:19:30 +02:00
unknown
898fc2e210 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0


scripts/Makefile.am:
  Auto merged
2007-05-02 17:15:48 +02:00
unknown
67601f55cb Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M51/mysql-5.1


libmysqld/Makefile.am:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged
client/Makefile.am:
  Merge does not fit - to be done manually.
2007-05-02 14:08:43 +02:00
unknown
589ae7b4e0 Format corrections for various "Makefile.am": Leading tab, no trailing blank.
client/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
libmysqld/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
netware/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
scripts/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
win/Makefile.am:
  After a backslash (to mark a continuation line) there must not be a trailing blank.
2007-05-02 14:01:49 +02:00
unknown
8cf38a1c1b Merge trift2.:/MySQL/M50/netware-cross-5.0
into  trift2.:/MySQL/M51/netware-cross-5.1


scripts/Makefile.am:
  Auto merged
2007-04-30 20:29:57 +02:00
unknown
a4a0faf4fd Necessary change for cross-builds: Include "mysql_fix_privilege_tables_sql.c" in the source tarball.
scripts/Makefile.am:
  Necessary change for cross-builds (like we do for NetWare):
  Generate "mysql_fix_privilege_tables_sql.c" during Bootstrap and include it in 
  the source tarball which is created via "make dist".
2007-04-30 17:01:00 +02:00
unknown
08e678c686 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


scripts/Makefile.am:
  Auto merged
2007-04-23 14:02:09 +02:00
unknown
b44eee2a67 Add "name of struct" as first arg to comp_sql
Fix "make distcheck"


scripts/CMakeLists.txt:
  Add "name of struct" as first arg to comp_sql
scripts/comp_sql.c:
  Add "name of struct" as first arg to comp_sql
2007-04-23 14:01:48 +02:00
unknown
9508b781ef Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


scripts/Makefile.am:
  Auto merged
2007-04-18 19:34:50 +02:00
unknown
b4573eb4ca Add CMakeLists.txt to EXTRA_DIST 2007-04-18 19:34:33 +02:00
unknown
6bfa5a40bc Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
scripts/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
client/mysql_upgrade.c:
  Use remote
mysql-test/r/mysql_upgrade.result:
  Use remote
Makefile.am:
  Merge "build scripts/ a little earlier"
include/my_global.h:
  Merge
2007-04-18 14:18:55 +02:00
unknown
1d24597ff9 Bug#25452 mysql_upgrade access denied
- Improve mysql_upgrade and add comments describing it's logic
 - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
  was started from
 - Don't look for mysql_fix_privilege_tables.sql randomly, compile
  in the mysql_fix_privilege_tables.sql file and use that to upgrade
  the system tables of MySQL
 - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
 - Fix bug#26639, bug#24248 and bug#25405


BitKeeper/etc/ignore:
  Added scripts/comp_sql scripts/mysql_fix_privilege_tables_sql.c to the ignore list
CMakeLists.txt:
  Build files also in scripts/
Makefile.am:
  Build scripts/ a little earlier to make
  the scripts/mysql_fix_privilege_tables_sql.c file available
  when client/ is built
client/mysql_upgrade.c:
  Updated version of mysql_upgrade with comments and logical functions
include/my_global.h:
  Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
mysql-test/r/mysql_upgrade.result:
  Update result
mysql-test/t/mysql_upgrade.test:
  Add more tests for different bugs related to mysql_upgrade
scripts/Makefile.am:
  Build comp_sql and mysql_fix_privilege_tables_sql.c
sql/mysql_priv.h:
  Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
scripts/CMakeLists.txt:
  New BitKeeper file ``scripts/CMakeLists.txt''
scripts/comp_sql.c:
  New BitKeeper file ``scripts/comp_sql.c''
2007-04-18 13:21:39 +02:00
unknown
3297d47fc3 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-02-28 16:41:30 +01:00
unknown
b1988b0d6f Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Null merge 4.1 patch


mysql-test/Makefile.am:
  Null merge to 4.1 patch
scripts/Makefile.am:
  No need to clean mysql_create_system_tablesa anyomre
2007-02-28 15:15:38 +01:00
unknown
c664530d70 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysql_system_tables_fix.sql:
  Auto merged
scripts/mysql_system_tables.sql:
  Manual merge
2007-02-28 14:41:57 +01:00
unknown
838e89dea6 Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Split out initial data in mysql_system_tables.sql to  it's own file
 - Use file from mysql_install_db and mysql-test-run


scripts/mysql_system_tables_fix.sql:
  Rename: scripts/mysql_fix_privilege_tables.sql.in -> scripts/mysql_system_tables_fix.sql
mysql-test/mysql-test-run.pl:
  - Add mysql_system_tables_data.sql as part of the bootstrap
  - Remove the addition of pid to end of bootstrap.sql, now
    to file used for bootstrap will be $opt_vardir/tmp/bootstrap.sql
  - Improve error message descibing how to find cause of a
    failed bootstrap
scripts/Makefile.am:
  - Rename mysql_fix_privileg_tables.sql.in to mysql_system_tables_fix.sql
  - Build mysql_fix_privilege_tables from mysql_system_tables.sql and
    mysql_system_tables_fix.sql
  - Add mysql_system_tables_fix.sql to EXTRA_DIST
scripts/mysql_install_db.sh:
  - Use mysql_system_tables_data.sql file when bootstrapping
    mysql, it will contain initial data for MysQL system tables
scripts/mysql_system_tables.sql:
  Move initial data for system tables to it's own file
scripts/mysql_system_tables_data.sql:
  Move initial data for system tables to it's own file
2007-02-28 14:26:58 +01:00
unknown
c431ab112d Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Auto merged
mysql-test/r/mysql_upgrade.result:
  SCCS merged
mysql-test/t/lock_multi.test:
  Use local
mysql-test/t/rpl_temporary.test:
  Use local
mysql-test/Makefile.am:
  Manual merge
scripts/mysql_fix_privilege_tables.sh:
  Manual merge
scripts/mysql_fix_privilege_tables.sql.in:
  Manual merge
scripts/mysql_install_db.sh:
  Manual merge
2007-02-26 14:25:59 +01:00
unknown
5d4e0417ad Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Use mysql_system_tables.sql to create MySQL system tables in
   all places where we create them(mysql_install_db, mysql-test-run-pl
   and mysql_fix_privilege_tables.sql)


BitKeeper/deleted/.del-init_db.sql:
  Rename: mysql-test/init_db.sql -> BitKeeper/deleted/.del-init_db.sql
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Rename: mysql-test/lib/init_db.sql -> BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
  Rename: scripts/mysql_create_system_tables.sh -> BitKeeper/deleted/.del-mysql_create_system_tables.sh
BitKeeper/etc/ignore:
  Added scripts/mysql_fix_privilege_tables.sql to the ignore list
mysql-test/Makefile.am:
  lib/init_db.sql has been removed
mysql-test/mysql-test-run.pl:
  - Build var/tmp/bootstrap.sql from mysql_system_tables.sql,
  mysql_test_data_timezone.sql and fill_help_tables.sql and use
  it when bootsraping the system tables to use during test.
mysql-test/r/create.result:
  Update result file
mysql-test/r/derived.result:
  Update result file
mysql-test/r/join.result:
  Update result file
mysql-test/r/mysql_upgrade.result:
  Update result file
mysql-test/r/sp-security.result:
  Update result file
mysql-test/t/create.test:
  Add user mysqltest_1 before trying to connect as that user - no
  anon users by default anymore
mysql-test/t/derived.test:
  Add user mysqltest_1 before trying to connect as that user - no
  anon users by default anymore
mysql-test/t/grant2.test:
  Add anonymous users for part of thes that need it.
mysql-test/t/grant_cache.test:
  Add anonymous users for part of thes that need it.
mysql-test/t/init_connect.test:
  Add anonymous users for part of thes that need it.
mysql-test/t/lock_multi.test:
  Add anonymous users for part of thes that need it.
mysql-test/t/ndb_basic.test:
  Connect as "root", blank user will take currently logged in
  username
mysql-test/t/ndb_index_ordered.test:
  Connect as "root", blank user will take currently logged in
  username
mysql-test/t/ndb_multi.test:
  Connect as "root", blank user will take currently logged in
  username
mysql-test/t/overflow.test:
  Connect as root - no anonymous users by default anymore
mysql-test/t/rpl_temporary.test:
  Add anonymous users for the test
mysql-test/t/xa.test:
  Connect as "root", blank user wil pick currently logged in user
scripts/Makefile.am:
  Remove mysql_create_system_tables.sh
  Add mysql_system_tables.sql and mysql_test_data_timezone.sql
  Build mysql_fix_privilege_tables.sql from mysql_system_tables.sql
  and mysql_fix_privilege_tables.sql.in
scripts/mysql_fix_privilege_tables.sh:
  Update message describing what the script does
scripts/mysql_fix_privilege_tables.sql.in:
  Remove the part that creates system tables as that will be added to
  mysql_fix_privileg_tables.sql from mysql_system_tables.sql
  Change all comments to use #
scripts/mysql_install_db.sh:
  Use mysql_system_tables.sql to create the MySQL system tables
  Update comments and indentation
  Add more descriptive comments about --windows switch
  Reduce number of hardcoded names for the SQL files the script
  looks for
mysql-test/include/add_anonymous_users.inc:
  New BitKeeper file ``mysql-test/include/add_anonymous_users.inc''
mysql-test/include/delete_anonymous_users.inc:
  New BitKeeper file ``mysql-test/include/delete_anonymous_users.inc''
scripts/mysql_system_tables.sql:
  New BitKeeper file ``scripts/mysql_system_tables.sql''
scripts/mysql_test_data_timezone.sql:
  New BitKeeper file ``scripts/mysql_test_data_timezone.sql''
2007-02-26 11:49:24 +01:00