mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39384 commits 2790 branches 343 tags 1.7 GiB
Commit graph

995 commits

Author SHA1 Message Date
tsmith/tim@siva.hindu.god
93bbb19fc1 Merge siva.hindu.god:/usr/home/tim/m/bk/g41 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-12-21 18:18:27 -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
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
7364bc113e Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic
 2006-11-07 22:49:46 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
3d7a9bdd6b make_binary_distribution.sh: 
Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt
 2006-11-07 22:26:37 +01:00
msvensson@neptunus.(none)
2459dd55f5 Copy *.cnf file from std_data/ when doing a binary distribution 2006-10-23 10:56:13 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f97fe50dbb Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-10-21 01:13:50 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
08d47a3b81 make_win_bin_dist: 
Copy udf examples and raid.h
  Create target "include" directory before copying files to it
CMakeLists.txt:
  Only compile in bdb if configured
configure.in:
  Raised version number to 5.0.27
 2006-10-21 00:57:08 +02:00
msvensson@shellback.(none)
9a8bc01f8c Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 09:05:34 +02:00
tsmith/tim@siva.hindu.god
1d5d5a1c4a Merge siva.hindu.god:/usr/home/tim/m/bk/40 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-10-02 16:18:42 -06:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
bf29b9db98 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-09-25 01:32:55 +02:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
878416e054 mysql_config.sh: 
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
  Filter out icc specific options from cflags/libs(_r)
 2006-09-25 00:54:46 +02:00
hartmut@mysql.com/linux.site
871eeadc94 Add SSL specific linker flags to --libmysqld-libs (Bug #21239) 2006-09-15 16:35:50 +02:00
cmiller@zippy.cornsilk.net
c3984c71b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.0-maint
 2006-09-06 14:50:53 -04:00
georg@lmy002.wdf.sap.corp
66133b7f74 included make_win_bin_dist (required for pushbuild) into distribution (make dist) 2006-09-01 16:55:35 +02:00
georg@lmy002.wdf.sap.corp
5686da41ac Fixes for crashes and test failures 2006-09-01 14:34:37 +02:00
cmiller@zippy.cornsilk.net
543fcde9b9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
 2006-08-09 22:23:41 -04:00
cmiller@zippy.cornsilk.net
dd5eeaf676 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ
 2006-08-02 14:57:12 -04:00
evgen@moonbone.local
7f0a080660 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-08-02 16:46:55 +04:00