mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
54100 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1351 commits

Author SHA1 Message Date
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
joerg@trift2.
2e5e79cf37 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-03-23 10:57:17 +01:00
kent@kent-amd64.(none)
9ed4f86eaf Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-22 19:44:14 +01:00
kent@mysql.com/kent-amd64.(none)
b961d9dc06 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-22 19:43:41 +01:00
kent@mysql.com/kent-amd64.(none)
a55735b964 .del-fill_func_tables.sh: 
Delete: scripts/fill_func_tables.sh
.del-fill_help_tables.sh:
  Delete: scripts/fill_help_tables.sh
.del-internals.texi:
  Delete: Docs/internals.texi
 2007-03-22 19:43:15 +01:00
tsmith@quadxeon.mysql.com
54e7bc8daa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-22 01:04:39 +01:00
kostja@bodhi.local
39eafdd853 Fix a broken merge. 2007-03-21 19:20:44 +03:00
kent@kent-amd64.(none)
a149769b2d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 17:58:30 +01:00
kent@mysql.com/kent-amd64.(none)
cd1005ab04 vio.vcproj, mysqld.vcproj, mysys.vcproj, libmysqld.vcproj, mysqldemb.vcproj: 
No need to set LICENSE or USE_SYMDIR from project files
make_win_bin_dist:
  Changed location of SQL initialization files to be "share/"
 2007-03-20 15:12:50 +01:00
kostja@bodhi.local
bdb10baec1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-03-20 00:42:11 +03:00
kent@mysql.com/kent-amd64.(none)
731c3e5b20 mysys.vcproj: 
Removed accidently added my_winsem.c
make_win_bin_dist:
  Corrected test for relwithdebinfo target
mysql.sln:
  Specify that comp_err depends on zlib
 2007-03-19 22:41:16 +01:00
kent@mysql.com/kent-amd64.(none)
e9d65ba363 make_win_bin_dist: 
Restore accidently removed line
 2007-03-19 16:45:37 +01:00
kent@mysql.com/kent-amd64.(none)
19a6a09126 Many files: 
Major cleanup of old Visual Studio project files, aligning engines etc
 2007-03-19 16:18:10 +01:00
df@pippilotta.erinye.com
4f7677cd24 Merge dev:my/mysql-5.0-release 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release
 2007-03-19 11:30:30 +01:00
msvensson@pilot.blaudden
709f066948 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-19 11:15:59 +01:00
kent@mysql.com/kent-amd64.(none)
1c6fc80fdc make_win_bin_dist: 
- Support both "release" and "relwithdebinfo" targets
  - Copy ".pdb" and ".pdb" files for the server and instance manager
  - Removed the examples directory, unsupported
  - Handle both old and new builds in the same script, "-debug" and "-nt"
    extensions, directory "data" and "share" in different location
 2007-03-18 10:47:15 +01:00
joerg@trift2.
66960bd1e7 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Build sql files for netware from the mysql_system_tables*.sq files
 - Fix comments about mysql_create_system_tables.sh
 - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
 - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files

Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.
 2007-03-16 20:56:16 +01:00
msvensson@pilot.blaudden
88b4c86e09 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Build sql files for netware from the mysql_system_tables*.sq files
 - Fix comments about mysql_create_system_tables.sh
 - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
 - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
 2007-03-16 17:28:32 +01:00
kroki/tomash@moonlight.home
6d8f6b5bfd BUG#16420: Events: timestamps become UTC 
BUG#26429: SHOW CREATE EVENT is incorrect for an event that
           STARTS NOW()
BUG#26431: Impossible to re-create an event from backup if its
           STARTS clause is in the past
WL#3698: Events: execution in local time zone

The problem was that local times specified by the user in AT, STARTS
and ENDS of CREATE EVENT/ALTER EVENT statement were converted to UTC,
and the original time zone was forgotten.  This way, event scheduler
couldn't honor Daylight Saving Time shifts, and times shown to the
user were also in UTC.  Additionally, CREATE EVENT didn't allow times
in the past, thus preventing straightforward event restoration from
old backups.

This patch reworks event scheduler time computations, performing them
in the time zone associated with the event.  Also it allows times to
be in the past.

The patch adds time_zone column to mysql.event table.

NOTE: The patch is almost final, but the bug#9953 should be pushed
first.
 2007-03-16 17:31:07 +03:00
cbell/Chuck@mysql_cab_desk.
3e44599c11 WL#3629 - Replication of Invocation and Invoked Features 
This changeset adds replication of events and user-defined functions. 
There are several bug reports involved in this change:

BUG#16421, BUG#17857, BUG#20384:
This patch modifies the mysql.events table to permit the addition of
another enum value for the status column. The column now has values
of ('DISABLED','SLAVESIDE_DISABLED','ENABLED'). A status of
SLAVESIDE_DISABLED is set on the slave during replication of events.
This enables users to determine which events werereplicated from the 
master and to later enable them if they promote the slave to a master.
The CREATE, ALTER, and DROP statements are binlogged.
A new test was added for replication of events (rpl_events).

BUG#17671:
This patch modifies the code to permit logging of user-defined functions.
Note: this is the CREATE FUNCTION ... SONAME variety. A more friendly error 
message to be displayed should a replicated user-defined function not be
found in the loadable library or if the library is missing from the
slave.The CREATE andDROP statements are binlogged. A new test was added 
for replication of user-defined functions (rpl_udf). 

The patch also adds a new column to the mysql.event table named
'originator' that is used to store the server_id of the server that
the event originated on. This enables users to promote a slave to a 
master and later return the promoted slave to a slave and disable the
replicated events.
 2007-03-16 09:56:57 -04: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
df@pippilotta.erinye.com
baaf7ac5da add missing test cases to windows binary distribution 2007-03-12 13:15:43 +01:00
msvensson@pilot.blaudden
189f592551 Bug#24248 Problem updating from 5.0.15 to 5.1.12 running under Win XP SP2 
- Fix error message to say that "mysql_upgrade" should be run when
 a particular error message is found to be missing
 - Dont's set default value on blob's - it will not be used anyway.
 2007-03-08 15:43:54 +01:00
tsmith@quadxeon.mysql.com
de61dde90b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
 2007-03-08 01:00:49 +01:00
msvensson@pilot.blaudden
a49d6c5f51 There is no .sql files in mysql-test/lib/ anymore, don't try to copy from there 2007-03-01 07:23:37 +01:00
msvensson@pilot.blaudden
d56d34805c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 20:45:07 +01:00
msvensson@pilot.blaudden
0b4598a4b3 Bug #20166 mysql-test-run.pl does not test system privilege tables creation 
- No .sql files in mysql-test/lib/ anymore, don't copy them
 2007-02-28 20:44:49 +01:00
msvensson@pilot.blaudden
9591b9e922 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:41:30 +01:00
msvensson@pilot.blaudden
fb36bf9562 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Null merge 4.1 patch
 2007-02-28 15:15:38 +01:00
msvensson@pilot.blaudden
3fc963f169 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 2007-02-28 14:58:19 +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
joerg@trift2.
ea2261d1a1 A binary package should also contain the "mysqld-debug" server (backport from 5.1). 2007-02-28 11:23:00 +01:00
msvensson@pilot.blaudden
2f36118018 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-27 15:29:44 +01:00
msvensson@pilot.blaudden
c66f902862 Bug#23669 mysql.proc not created in default install 
- Remove DEFAULT values for blob's in mysql_system_tables.sql
 2007-02-27 15:28:19 +01:00
msvensson@pilot.blaudden
885e4fb5b9 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
 2007-02-27 14:25:56 +01:00
msvensson@pilot.blaudden
394e9e86d6 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Escape undercore character in mysql.db to only allow
  access test_% and not test%
 2007-02-27 14:10:27 +01:00
msvensson@pilot.blaudden
846e5ad8d3 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Updates for 5.1
 2007-02-27 11:39:29 +01:00
msvensson@pilot.blaudden
fce4cd3ec0 Remove another spurious " 2007-02-26 14:49:41 +01:00
msvensson@pilot.blaudden
386e08af1e Remove spurious " 2007-02-26 14:48:41 +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
msvensson@pilot.mysql.com
7e6e518a47 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-13 10:00:59 +01:00
msvensson@pilot.mysql.com
7dcdbdf37b Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-13 10:00:53 +01:00
kent@kent-amd64.(none)
f4ab936ff1 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1
 2007-02-12 23:37:12 +01:00
kent@mysql.com/kent-amd64.(none)
3bb1114647 make_binary_distribution.sh: 
Copy "ndb_size.tmpl" into binary distribution (Bug#24191)
 2007-02-09 00:10:40 +01:00
msvensson@neptunus.(none)
e4001b3b5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 15:46:17 +01:00
msvensson@neptunus.(none)
ede3afe470 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:45:08 +01:00
istruewing@chilla.local
ed09987083 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-01 19:41:04 +01:00
cmiller@zippy.cornsilk.net
a795b7097f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-01-31 16:26:12 -05:00
cmiller@zippy.cornsilk.net
522d6fb0cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-01-31 16:24:28 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-31 16:23:05 -05:00
kent@mysql.com/kent-amd64.(none)
e580bd6c6f gen_lex_hash.cc: 
If inserting a GPL header, include a complete one
Makefile.am, mysql.dsw, mysql.sln:
  Removed C version of mysql-test-run
mysql.spec.sh:
  Specify GPL license only in GPL sources
.del-my_manage.h:
  Delete: mysql-test/my_manage.h
mysql.spec.sh:
  Added GPL header
.del-mysql_test_run_new.c:
  Delete: mysql-test/mysql_test_run_new.c
.del-mysql_test_run_new.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
.del-my_create_tables.c:
  Delete: mysql-test/my_create_tables.c
.del-mysql_test_run_new_ia64.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
msql2mysql.sh:
  Use up-to-date GPL header
.del-mysql_test_run_new.vcproj:
  Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
.del-my_manage.c:
  Delete: mysql-test/my_manage.c
 2007-01-31 00:06:42 +01:00
mtaylor@qualinost.(none)
065ab1537a Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2007-01-26 12:13:59 -08:00
mtaylor@qualinost.(none)
58ae89cb76 User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0. 2007-01-26 12:00:38 -08:00
svoj@april.(none)
3efc296508 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-01-25 01:44:30 +04:00
iggy@recycle.(none)
54ce485557 Merge recycle.(none):/src/bug24496/my50-bug24496 
into  recycle.(none):/src/mysql-5.0-maint
 2007-01-24 09:29:50 -05:00
iggy@recycle.(none)
d554b1f725 Merge recycle.(none):/src/bug24496/my51-bug24496 
into  recycle.(none):/src/mysql-5.1-maint
 2007-01-24 09:29:05 -05:00
iggy@recycle.(none)
fc66e47247 Merge recycle.(none):/src/bug24496/my50-bug24496 
into  recycle.(none):/src/bug24496/my51-bug24496
 2007-01-23 10:10:08 -05:00
iggy@recycle.(none)
a0c981d254 Bug#24496:Fresh install of mysql on windows has anonymous user with root access. 
- Add anonymous user with no rights.
 2007-01-23 10:01:56 -05:00
df@kahlann.erinye.com
96e9eee142 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-24780 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
 2007-01-22 16:38:54 +01:00
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
df@kahlann.erinye.com
5fe6fc1d2f Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2007-01-22 16:33:37 +01:00
tsmith@siva.hindu.god
cc7afe2494 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 08:30:35 -07: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
msvensson@pilot.mysql.com
8154355a07 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-01-17 11:13:03 +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
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
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
b008f57cb7 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-24780
 2007-01-09 09:52:38 +01: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
cmiller@zippy.cornsilk.net
a16eaf3301 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
 2007-01-07 09:31:49 -05:00
kent@kent-amd64.(none)
1a0e36ea6d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-01-05 17:30:40 +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
acurtis/antony@xiphis.org/ltamd64.xiphis.org
c678f8e186 Bug#24270 
"mysql_install_db doesn't work properly on 5.1"
  force sql_mode to known value within initialization scripts
 2007-01-02 09:42:13 -08:00
kent@kent-amd64.(none)
4b2067f324 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-01-01 05:37:55 +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)
67868597bb Many files: 
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
 2006-12-31 02:29:11 +01: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
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
tsmith/tim@siva.hindu.god
0cb9cee7f4 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
 2006-12-26 16:49:10 -07:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01: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
patg@radha.patg.net
2e538b4192 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
 2006-12-22 08:57:32 -05:00
tsmith/tim@siva.hindu.god
8075fc447e Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-21 18:23:14 -07: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
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
joerg@trift2.
7f0cb242bc Merge trift2.:/MySQL/M50/upward-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-12-20 19:24:04 +01:00
mtaylor@qualinost.(none)
92b5b1ef78 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
 2006-12-18 21:26:12 -08: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
baker@bk-internal.mysql.com
b1d173f510 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-18 17:57:34 +01:00
mtaylor@qualinost.(none)
ca0f2e85cc Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
 2006-12-15 16:19:32 -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)
3a682ca78d Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
 2006-12-15 13:23:57 -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)
e30dfac98b Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
 2006-12-14 12:21:37 -08: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
patg@radha.myhome.westell.com
b892f9adf8 WL #3031 
* New result files due to new error message/error numbers
* Fixed system_mysql_db tests to work with servers table
* Added UTF8 charset to table defs
 2006-12-11 11:44:03 -05: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
df@kahlann.erinye.com
024597b3e1 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-11 10:45:39 +01:00
patg@govinda.patg.net
f9097b86af Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
 2006-12-08 22:30:18 -05:00
patg@govinda.patg.net
98062f567d WL# 3031 
Post-commit issues fixed
* Test results for other tests fixed due to added error #s
* Memory allocation/free issues found with running with valgrind
* Fix to mysql-test-run shell script to run federated_server test (installs
mysql.servers table properly)
 2006-12-08 22:19:51 -05:00
msvensson@neptunus.(none)
aba988485a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-08 16:53:59 +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
01395b1dc0 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-07 15:21:05 +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
msvensson@neptunus.(none)
971c783f7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-04 19:11:55 +01:00
mskold/marty@linux.site
a63d255bac Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-03 17:03:01 +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
patg@radha.tangent.org
a3e85cce4e WL# 3031 
Backport of functionality in private 5.2 tree. 

Added new language to parser, new mysql.servers table and associated code
to be used by the federated storage engine to allow central connection information
per WL entry.
 2006-12-01 19:47:45 -05:00
mskold/marty@linux.site
6f0e7a2631 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-01 21:12:13 +01:00
mskold/marty@mysql.com/linux.site
cde79e4f79 Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
msvensson@neptunus.(none)
dc88e57744 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-30 13:04:24 +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
monty@mysql.com/narttu.mysql.fi
23263db66e Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations 
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
 2006-11-29 22:51:09 +02:00
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 15:44:09 +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)
0e4d97edf0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-23 18:38:27 +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
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
jimw@rama.(none)
f7e19b40f3 Merge rama.(none):/home/jimw/my/tmp_merge 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-07-28 15:51:48 -07:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-07-28 23:40:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c188a3bf0a make_binary_distribution.sh: 
Man page for "mysqld" command move to section 8 (bug#21220)
 2006-07-28 23:06:49 +02:00
iggy@rolltop.ignatz42.dyndns.org
b146324946 Bug #18777: Mysqlhotcopy does not copy all the direcories. 2006-07-26 12:36:10 -04:00
msvensson@neptunus.(none)
d89f177377 Bug#21125 mysqldump: Problem with non-standard table names 
- The mysql-test/std_data/bug15328.cnf file was not copied to install or dist dir.
 2006-07-24 14:31:37 +02:00
evgen@moonbone.local
b7a55b9b5c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-07-18 23:45:17 +04:00
igor@rurik.mysql.com
6e75a11b01 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-14 14:45:23 -07: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
cmiller@zippy.(none)
87dd9b978c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
 2006-07-13 11:12:41 -04:00
cmiller@zippy.(none)
2c5308a703 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
 2006-07-13 11:11:20 -04:00
iggy@rolltop.ignatz42.dyndns.org
d3eab1ca35 Bug #19779: mysql_explain_log documentation is outdated. 2006-07-13 10:48:34 -04:00
joerg@trift2.
dcf85ebec4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 
into trift2.:/M51/bug20216-5.1
 2006-07-06 17:58:31 +02:00
joerg@trift2.
1746d41862 Merge mysql.com:/M50/tmp_merge_kent into mysql.com:/M51/merge-kent-5.1 2006-07-05 16:30:13 +02:00
igor@rurik.mysql.com
ce57588434 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-01 15:31:28 -07:00
knielsen@rt.int.sifira.dk
dcd9132fe7 Merge mysql.com:/usr/local/mysql/mysql-5.1-bindist 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-06-30 15:21:45 +02:00
knielsen@mysql.com
5b1c92244c Add a script scripts/make_win_bin_dist, used to generate a Windows 
binary disctribution for Falcon.
 2006-06-30 15:15:20 +02:00
elliot@mysql.com
68db32613b Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
 2006-06-30 00:14:25 -04:00
cmiller@zippy.(none)
244bdc96c3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
 2006-06-29 13:49:40 -04:00
joerg@mysql.com
dcc67c0080 Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516). 2006-06-29 11:59:05 +02:00
igreenhoe@mysql.com
1d8e1ba3a6 Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/greenman/workspace-mysql/mysql/pending/bug-5.0-17353
 2006-06-28 08:32:41 -07:00
iggy@mysql.com
578fee6990 Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter 2006-06-27 18:07:23 -04:00
joerg@mysql.com
d6038ede17 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/autopush20216-5.0
 2006-06-27 22:45:21 +02:00
kent@mysql.com
b1d3bd5a7a Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-06-27 00:13:45 +02:00
kent@mysql.com
748b287cad Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-06-26 23:47:14 +02:00
kent@mysql.com
c36dd28676 make_sharedlib_distribution.sh: 
For compatibility, don't use {..,..} in pattern matching
make_binary_distribution.sh:
  Added .dylib and .sl as shared library extensions
 2006-06-26 23:44:17 +02:00
kent@mysql.com
b6e89c2b1e .del-make_win_src_distribution.sh~f80d8fca44e4e5f1: 
Delete: scripts/make_win_src_distribution.sh
Makefile.am:
  Unix and Windows now shares source package
 2006-06-25 10:25:00 +02:00
igor@rurik.mysql.com
b5bdc178af Fixed some dsp files. 
Fixed make_win_src_distribution.sh to return back dsp files
for yassl.
 2006-06-23 18:21:34 -07:00