mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34553 commits 2781 branches 343 tags 1.6 GiB
Commit graph

861 commits

Author SHA1 Message Date
df@kahlann.erinye.com
1b8b33bf83 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-22 16:34:22 +01:00
msvensson@pilot.mysql.com
51292deb36 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-01-17 11:53:00 +01:00
mmj@tiger.mmj.dk
86890b8919 mysql_explain_log.sh: 
Patch from Paul DuBois for better help messages
 2007-01-12 01:04:39 +01:00
cmiller@zippy.cornsilk.net
896e2623eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-11 09:43:44 -05:00
mmj@tiger.mmj.dk
49913f2a95 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
 2007-01-11 09:19:32 +01:00
tsmith@siva.hindu.god
bac65ee90a WL #3670: Compile-time option to remove GRANT-related startup options 
- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
  --bootstrap
  --init-file
  --skip-grant-tables

Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.

For example:

$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test
 2007-01-09 19:22:01 -07:00
df@kahlann.erinye.com
b3eadd2b74 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780
 2007-01-09 09:51:49 +01:00
df@kahlann.erinye.com
eeb82a8ed5 BUG#24780 workaround for broken installations that depend on using /etc, but were configured differently 2007-01-09 09:32:56 +01:00
kent@mysql.com/kent-amd64.(none)
fa5a359f07 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-01-05 16:57:23 +01:00
kent@mysql.com/kent-amd64.(none)
528b457644 mysql.spec.sh, make_binary_distribution.sh: 
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture
 2007-01-05 16:53:03 +01:00
kent@mysql.com/kent-amd64.(none)
21c7eca2bf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-01-01 05:35:10 +01:00
kent@mysql.com/kent-amd64.(none)
88b3c4f03a Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-01-01 05:31:23 +01:00
kent@mysql.com/kent-amd64.(none)
0255a1c9c2 mysql_secure_installation.sh: 
Portable handling of "echo" without newline (bug#24605)
check-cpu:
  In developer script safe to use "printf", not "echo -n"
 2007-01-01 05:30:31 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s: 
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
 2006-12-31 01:02:27 +01:00
tsmith/tim@siva.hindu.god
682596d7ce Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-26 22:28:28 -07:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
tsmith/tim@siva.hindu.god
f204db4dd1 Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-21 18:20:09 -07:00
mtaylor@qualinost.(none)
bcebea9684 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2006-12-18 21:16:18 -08:00
mtaylor@qualinost.(none)
09591de344 Search through options to find where the slow query log actually is. 2006-12-18 21:12:01 -08:00
mtaylor@qualinost.(none)
7f3d0c92c4 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2006-12-15 16:18:03 -08:00
mtaylor@qualinost.(none)
373e280eb3 support /etc/mysql/my.cnf in mysqld_multi as well. 2006-12-15 16:17:10 -08:00
mtaylor@qualinost.(none)
265370f5c3 Added /etc/mysql to my.cnf search path after /etc. 
bug #25104
 2006-12-15 12:34:36 -08:00
mtaylor@qualinost.(none)
b1e7c78302 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2006-12-15 11:45:26 -08:00
mtaylor@qualinost.(none)
3da37d3fa2 Added support for sensible-editor from Debian, instead of emacs. 2006-12-15 10:57:58 -08:00
df@kahlann.erinye.com
905d9e848c also include data files for varbinary test in binary distribution 2006-12-15 17:57:31 +01:00
mtaylor@qualinost.(none)
b8542e9cd7 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2006-12-14 12:20:31 -08:00
mtaylor@qualinost.(none)
54e7d71477 Change permissions on $mysql_unix_port_dir if we create it so that everyone can access it. 2006-12-14 12:18:36 -08:00
df@kahlann.erinye.com
78e1df3e9f Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2006-12-11 10:51:29 +01:00
df@kahlann.erinye.com
476632aad9 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-11 10:49:31 +01:00
msvensson@neptunus.(none)
0b41593db6 Fix problems with "make dist" and running from "binary dist" 2006-12-08 12:13:43 +01:00
df@kahlann.erinye.com
bb1297cdc3 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-07 15:13:12 +01:00
df@kahlann.erinye.com
77965c013c BUG#24780 use --sysconfdir in scripts 2006-12-07 15:02:32 +01:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-04 19:28:38 +01:00
kent@mysql.com/kent-amd64.(none)
d72b71ef9f mysql_install_db.sh: 
If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)
 2006-12-02 23:16:47 +01:00
msvensson@neptunus.(none)
af5882a175 Merge neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-30 11:40:13 +01:00
msvensson@neptunus.(none)
dcf0f346cf Bug#20589 Missing some table level privileges after upgrade 
- The table_priv column of table_privs table was altered to a enum type
   with fewer enums causing the SHOW/CREATE VIEW grants to be truncated.
 - Improved comments and moved all declarations for table_privs, column_privs
   and proc_privs to one section for each table making it easy to see hat alterations
   are performed on each table
 - Reduced the number of ALTER's slightly, but as this is an upgrade script we need
   to take all possibilites into account.
 2006-11-29 12:04:29 +01:00
msvensson@neptunus.(none)
86f0d1bb03 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-24 12:12:25 +01:00
msvensson@neptunus.(none)
c76adf6021 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
88d2c9d130 Merge neptunus.(none):/home/msvensson/mysql/bug20589/my41-bug20589 
into  neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589
 2006-11-22 09:52:56 +01:00
msvensson@neptunus.(none)
0a27881be5 Bug #20589 Missing some table level privileges after upgrade 
- Update comments to reflect correct version
 2006-11-22 09:52:31 +01:00
msvensson@neptunus.(none)
d89db5edf8 When runnig from binary dist the .sql files are found in share/ directory 2006-11-21 21:39:37 +01:00
msvensson@neptunus.(none)
13b5e6275a Add ALTER TABLE MODIFY statements in addition to the ALTER TABLE ADD for new 
columns to make sure they both exist and have the intended type
 2006-11-21 16:31:44 +01:00
cmiller@zippy.cornsilk.net
b24d39c9e7 Change collation for ALTER-omitted ENUMs from utf8_bin (where "y" and 
"Y" are different) to utf8_general_ci (where same).
 2006-11-20 15:37:22 -05:00
cmiller@zippy.cornsilk.net
a70b94281c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my41-bug17700 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-11-15 10:03:54 -05:00
cmiller@zippy.cornsilk.net
07ff53ea2f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-15 10:01:50 -05:00
cmiller@zippy.cornsilk.net
2b3a69eb42 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my41-bug17700 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700
 2006-11-15 09:55:24 -05:00
cmiller@zippy.cornsilk.net
3ebd031e00 Bug#17700: mysql_fix_privilege_tables cannot handle a password \ 
with embedded spaces
  
Problem:  Original code written assuming password contains no spaces.
Further, because of how sh interprets characters in variables, you
cannot do the "simple solution".
  
Solution:  Move the "was a password provided" check to the end. This
allows us to correctly quote the password argument when passed to the
mysql client program.  Addendum:  Put this check inside of a shell fn
to simplify the code.
 2006-11-15 09:54:54 -05:00
df@kahlann.erinye.com
4dd2d7062a Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 14:48:29 +01:00
df@kahlann.erinye.com
5d8525c6f7 make_binary_distribution should of course also copy .test files from mysql-test/include 2006-11-14 14:44:20 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1d932b992c Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic
 2006-11-07 22:55:19 +01:00