mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48044 commits 2776 branches 343 tags 1.6 GiB
Commit graph

116 commits

Author SHA1 Message Date
acurtis/antony@ltamd64.xiphis.org
a4dbc0990c Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
 2007-05-04 23:35:14 -07:00
serg@sergbook.mysql.com
dbd683a7d9 mysql-test/mysql-test-run.pl: another mysqld --help fix 
scripts/mysql_install_db.sh: don't fail if --skip-XXX is not recognized
 2007-04-30 07:45:56 -07:00
tsmith@quadxeon.mysql.com
119ca8702f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-27 00:37:18 +02:00
tsmith@quadxeon.mysql.com
70a742f817 mysql_install_db.sh: Fix algorithm for finding pkgdata directory 2007-04-27 00:35:09 +02:00
tsmith@quadxeon.mysql.com
124f9d5415 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27390/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-26 23:07:33 +02:00
tsmith@quadxeon.mysql.com
4d34614389 mysql_install_db.sh: 
Disable broken quoting of extra arguments; proper fix requires using eval and lots more quoting throughout the script
 2007-04-25 09:16:38 +02:00
msvensson@pilot.blaudden
2aef31fa51 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-13 15:13:12 +02:00
msvensson@pilot.blaudden
74dfba96e7 Bug#27783 mysql_install_db should be able to install again, preserving existing files. 
- Allow mysql_install_db to be run a second time in the same
   datadir to create and fill any missing system tables
 2007-04-12 17:48:28 +02:00
msvensson@pilot.blaudden
4d99906ea7 Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my50-bug27022 
into  pilot.blaudden:/home/msvensson/mysql/bug27022/my51-bug27022
 2007-03-27 21:11:22 +02:00
msvensson@pilot.blaudden
cf0e52ea17 Bug#27022 Install fails with Duplicate entry '%-test-' for key 'PRIMARY' 
- Bail out with error if MySQL System tables already exist
 2007-03-16 11:52:30 +01:00
msvensson@pilot.blaudden
9cfd569174 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-28 14:41:57 +01:00
msvensson@pilot.blaudden
e391b86fb0 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
 2007-02-28 14:26:58 +01:00
msvensson@pilot.blaudden
f6e31a2cd1 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
 2007-02-26 14:25:59 +01:00
msvensson@pilot.blaudden
c550a45522 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)
 2007-02-26 11:49:24 +01:00
tsmith@siva.hindu.god
bc0e0ba7cc Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build 
into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
 2007-01-11 13:50:48 -07: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
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +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
kent@kent-amd64.(none)
2b5e2230bb Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-12-02 23:22:53 +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
brian@zim.(none)
41f920b013 Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-14 21:26:33 -07:00
brian@zim.(none)
8deb5beb9c Merge zim.(none):/home/brian/mysql/dep-5.0 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-08-14 15:24:29 -07:00
brian@zim.(none)
af443c2dd8 Fixed warning message breakage. 
Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references.
 2006-08-13 22:28:41 -07: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
iggy@rolltop.ignatz42.dyndns.org
bd791a15ae Bug #20721: mysql_install_db first line is blank. 
Minor script changes for uniformity.
 2006-07-14 15:22:16 -04:00
jimw@mysql.com
55727ef6d0 Remove sql-bench from the server repository -- it is being maintained 
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.
 2006-04-13 10:34:46 -07:00
kent@mysql.com
0298bfaac6 Merge 2006-04-03 03:52:22 +02:00
kent@mysql.com
6ba1a85726 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-04-03 03:40:54 +02:00
kent@mysql.com
e1d6c31984 mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c: 
Changed web address order.mysql.com to shop.mysql.com
 2006-04-03 03:37:43 +02:00
dlenev@mysql.com
e7f29e1904 Manual merge of fix for bug #9913 into 5.0 tree. 2005-05-09 16:21:57 +04:00
serg@sergbook.mylan
b1edf49952 don't use tmp file for such a triviality 2005-05-09 09:24:05 +02:00
ram@gw.mysql.r18.ru
40daecb8b4 after merge fix up: 
we should use REPLACE for $hostaname queries to avoid problems when $hostname=localhost.
 2005-02-01 17:13:44 +04:00
ram@gw.mysql.r18.ru
edba2b9b33 A fix (bug #6000: No "@%"-accounts after install). 2005-01-28 15:26:17 +04:00
ram@gw.mysql.r18.ru
d177817cac Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6000
 2005-01-28 12:27:46 +04:00
jimw@mysql.com
bdb36de9ff Merge 2005-01-14 10:40:05 -08:00
jimw@mysql.com
b6d46b3c4c Merge 2005-01-14 10:33:07 -08:00
jimw@mysql.com
d7389eedd1 Fix mysql_install_db to look for libexecdir relative to basedir when 
it has been specified. (Bug #7347)
 2005-01-13 11:58:10 -08:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
b1e30904d5 WL#925 - Privileges for stored routines 
Implement fine-grained control over access to stored procedures
  Privileges are cached (same way as existing table/column privs)
 2004-12-23 10:46:24 +00:00
ram@gw.mysql.r18.ru
bd247e3d56 A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet). 2004-12-06 18:45:41 +04:00
ram@gw.mysql.r18.ru
307b7e85af A fix (bug #6000 No "@%"-accounts after install). 2004-10-20 18:10:44 +05:00
tomas@poseidon.(none)
5488f207db mysql_install_db should do skip-ndbcluster 
set a printout in SocketClient only for debug
 2004-09-16 08:22:22 +00:00
serg@serg.mylan
0d0a50ce6a language fix 2004-07-29 23:33:23 +02:00
monty@mysql.com
f6765146c1 Added missing root user to mysql.user on windows. (Bug #4242) 
Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938)
Don't use default arguments for ha_rnd_init()
Simple code cleanups since last pull
 2004-06-25 18:49:36 +03:00
monty@mysql.com
ad86016e2f lower_case_table_names=2 (Keep case for table names) was not honored 
with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)
 2004-06-23 16:44:34 +03:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
monty@mysql.com
f56df164f0 ke it possible to use mysys functions in netware/mysql_test_run.c 
Don't pass --user to mysqld if --user is not used
 2004-06-18 04:22:43 +03:00
monty@mysql.com
d28895d042 After merge fix 2004-06-10 16:44:39 +03:00