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
monty@nosik.monty.fi
38a92caeb7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-21 23:12:45 +02: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
monty@mysql.com/nosik.monty.fi
f6682e2743
Added --debug-info to most clients to detect memory leaks in mysql-test-run
...
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
2006-11-21 22:32:58 +02:00
msvensson@neptunus.(none)
7673a2d415
Update mysql_fix_privilege_tables.sql to handle upgrade from 5.0 while retaining
...
old upgrade behaviour.
Add test for upgrade from 5.0.30
2006-11-21 17:44:43 +01:00
msvensson@neptunus.(none)
30088b9d23
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-21 16:51:47 +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
17a4cb2b93
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my51-bug17700
2006-11-15 09:56:01 -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
a3d8fdbeb9
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/51
2006-11-14 14:49:45 +01: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@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e209edaa32
Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic
...
into mysql.com:/Users/kent/mysql/bk/lic/my51-lic
2006-11-07 23:01:38 +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
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
60104e1132
make_win_bin_dist:
...
Aligned script with updated 5.0 version
2006-10-20 20:18:44 +02:00
jonas@perch.ndb.mysql.com
2f7b2611f7
ndb - remove duplicate solution to ndb_restore_compat make_binary_distribution problem
2006-10-17 15:05:31 +02:00
jonas@perch.ndb.mysql.com
44e0587486
ndb - ndb_restore_compat
...
Update make_binary_distribution.sh
Make sure all files needed for testing are included
2006-10-17 13:34:00 +02:00
kent@mysql.com/c-794072d5.010-2112-6f72651.cust.bredbandsbolaget.se
8692bb53a3
make_binary_distribution.sh:
...
Split copy of result files to avoid shell limit.
Added copy of mysql-test/std_data/ndb_backup5{0,1}.
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.
2006-10-16 02:07:50 +02:00
msvensson@neptunus.(none)
ed250c1763
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-10-11 10:01:43 +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@c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
3a65bd1616
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1
2006-09-25 01:36:14 +02: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
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e826f7490e
mysql.spec.sh:
...
Added "test" RPM package
Install all binaries "make install" would
make_binary_distribution.sh:
Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
2006-09-24 00:41:20 +02:00
cmiller@zippy.cornsilk.net
895bf0555b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-15 11:25:02 -04: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
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
joerg@trift2.
a560c3ee1f
scripts/make_binary_distribution.sh : Drop the "max" server from 5.1 packages.
2006-08-14 19:56:41 +02: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
kroki/tomash@moonlight.intranet
5c272816ca
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-09 13:37:20 +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
msvensson@neptunus.(none)
f1a262bcd5
Merge bk-internal:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-07-31 16:07:28 +02:00
kroki/tomash@moonlight.intranet
5c90b6f810
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-07-29 13:43:34 +04:00