mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
57778 commits 2794 branches 343 tags 1.5 GiB
Commit graph

1414 commits

Author SHA1 Message Date
joerg@trift2.
8b0f68331b Necessary change for cross-builds: Include "mysql_fix_privilege_tables_sql.c" in the source tarball. 2007-04-30 17:01:00 +02: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
bfb0448a4d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-28 01:36:09 +02:00
tsmith@quadxeon.mysql.com
33a74e41fc Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-04-28 01:31:15 +02:00
tsmith@quadxeon.mysql.com
b90b0c7eb2 Bug #27390: mysqld_multi --config-file= not working as documented 
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options.  Treat old --config-file argument as if --defaults-extra-file
had been specified instead.

Plus a few other defaults-related cleanups.
 2007-04-28 01:27:54 +02: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
iggy@alf.
b2bf19354c Merge alf.:D:/src/mysql-5.1-maint 
into  alf.:D:/src/mysql-5.1-maint_pt
 2007-04-24 12:50:28 -04:00
iggy@alf.
0f43ac0d2a Minor fixes. 2007-04-24 12:41:08 -04:00
msvensson@pilot.blaudden
a4ee7302e6 Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-24 11:11:45 +02:00
msvensson@pilot.blaudden
4a1fd222ce Don't copy any subdirs in scripts/ 2007-04-23 18:16:57 +02:00
msvensson@pilot.blaudden
402d712991 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 14:02:09 +02:00
msvensson@pilot.blaudden
1561c39c5d Add "name of struct" as first arg to comp_sql 
Fix "make distcheck"
 2007-04-23 14:01:48 +02:00
msvensson@pilot.blaudden
d1de41c59a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 12:05:00 +02:00
msvensson@pilot.blaudden
b0d923d73b Don't copy subidrs of scripts/ 2007-04-20 20:46:55 +02:00
msvensson@pilot.blaudden
9c775302de Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-19 21:31:17 +02:00
msvensson@pilot.blaudden
da93a36a0e mysql_upgrade portability fixes 2007-04-19 21:30:46 +02:00
msvensson@pilot.blaudden
ce518d20ef Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-19 17:01:59 +02:00
msvensson@pilot.blaudden
41c41448b9 mysql_upgrade win fixes 2007-04-19 17:00:29 +02:00
msvensson@pilot.blaudden
77dcfdd8e7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 19:34:50 +02:00
msvensson@pilot.blaudden
50669c43ac Add CMakeLists.txt to EXTRA_DIST 2007-04-18 19:34:33 +02:00
msvensson@pilot.blaudden
f6240e374d Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 17:00:43 +02:00
msvensson@pilot.blaudden
76285bdf31 Update mysql_upgrade tests for 5.1 
Add "two liner" to mysqld --bootstrap that allows
wo write scripts that can be run both by mysql and mysqld --bootstrap
Remove duplicate create of MySQL system tables
 2007-04-18 16:23:19 +02:00
msvensson@pilot.blaudden
01133f8e6f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 14:18:55 +02:00
msvensson@pilot.blaudden
dd0d2146c3 Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3 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
 2007-04-18 13:21:39 +02:00
tomas@whalegate.ndb.mysql.com
5ee4948dec Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-04-16 14:51:55 +02:00
tomas@whalegate.ndb.mysql.com
a30755427a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-04-16 14:51:08 +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
df@pippilotta.erinye.com
6d70fd8751 don't copy pdb files from the release target output folder, since this target does not build them 2007-04-11 14:27:03 +02:00
df@pippilotta.erinye.com
5197d7712c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-release 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-04-10 13:15:07 +02:00
joerg@trift2.
22f066e354 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-07 20:46:43 +02:00
joerg@trift2.
d77ab7a009 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-04-07 20:30:26 +02:00
kent@kent-amd64.(none)
6a8582a8bc Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-build 
into  mysql.com:/home/kent/bk/sotest/mysql-5.1-build
 2007-04-05 08:42:32 +02:00
kent@mysql.com/kent-amd64.(none)
463b34e77b zlib.m4: 
Only require the more recent zlibCompileFlags() when
  building the server, client zlib don't need it.
Makefile.am:
  Always build the bundled zlib static only
configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
make_binary_distribution.sh:
  Real "mysqlmanager" executable might be in ".libs"
 2007-04-05 08:36:56 +02:00
df@pippilotta.erinye.com
817670eeee build fixes for 5.1.17 2007-04-04 14:19:47 +02:00
df@pippilotta.erinye.com
062ccf6905 BUG#27489 build fix 2007-04-02 15:20:46 +02:00
msvensson@pilot.blaudden
fc904eaead Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-02 11:15:09 +02:00
msvensson@pilot.blaudden
bb9a601829 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-02 10:50:39 +02:00
cbell/Chuck@mysql_cab_desk.
c7c1b341f7 WL#3629 - Replication of Invocation and Invoked Features 
This patch changes test to remove Windows-specific limitations and potential
rounding errors in the calculation of a UDF.

Also corrects a minor merge conflict.
 2007-03-29 16:43:00 -04:00
msvensson@pilot.blaudden
bde1d63d7e Bug#26922 Test 'varbinary' fails to do copy_file on Windows 
- Copy all *.MY* files from std_data/, we have some .MYD and .MYI
files from 4.1 there
5.0 version of make_win_bin_dist copies everything in std_data/
 2007-03-29 16:42:08 +02:00
cbell/Chuck@mysql_cab_desk.
a591514a67 Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
 2007-03-29 09:54:59 -04:00
cbell/Chuck@mysql_cab_desk.
89838e1008 WL#3629 - Replication of Invocation and Invoked Features 
This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct 
problems found during the recalculation of next execution of events in RBR.
 2007-03-29 08:17:19 -04:00
msvensson@pilot.blaudden
631476e1f3 Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my51-bug27022 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-27 21:12:59 +02:00
msvensson@pilot.blaudden
c083a8fdd5 Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my50-bug27022 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-27 21:12:32 +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
cbell/Chuck@mysql_cab_desk.
71c4bd1f0a Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
 2007-03-26 09:57:16 -04:00