Commit graph

874 commits

Author SHA1 Message Date
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02: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
konstantin@mysql.com
5c99b8b83f Merge mysql.com:/opt/local/work/tmp_merge
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 18:43:42 +04:00
kent@mysql.com
6ce9c90db9 mysqld_safe.sh:
Added --help option, bug#16392
acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332
2006-03-29 23:51:23 +02:00
kent@mysql.com
0d332aef39 Merge 2006-03-29 15:05:06 +02:00
kent@mysql.com
67f2b0f3bc mysql_config.sh:
If installed, search built in lib path first, bug#13158
2006-03-29 14:59:53 +02:00
ian@zim.(none)
9caff206c2 Merge zim.(none):/home/ian/workspace/mysql-5.0
into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian
2006-03-27 19:48:44 -08:00
kent@mysql.com
6b51a2c69f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-27 23:08:25 +02:00
kent@mysql.com
04f059c5bf mysql_config.sh:
Remove Solaris -xc99=none C option as C++ compiler can't handle it
2006-03-27 23:04:44 +02:00
kent@mysql.com
898db8b053 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-27 19:37:29 +02:00
kent@mysql.com
35ae639477 mysql_config.sh:
We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
2006-03-27 19:25:25 +02:00
andrey@lmy004.
531ad766ed fix for bug#16415 Events names are case sensitive 2006-03-24 17:45:52 +01:00
msvensson@neptunus.(none)
e2827d97ea Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-03 13:33:01 +01:00
kent@mysql.com
550e73cc6e mysql-test-run.pl:
Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
mysqld_safe.sh:
  Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861
2006-03-02 22:53:38 +01:00
msvensson@neptunus.(none)
d8153d4449 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-02 18:37:08 +01:00
joerg@mysql.com
6838660267 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1 2006-03-02 10:48:46 +01:00
msvensson@neptunus.(none)
24e959f348 Bug#17368 General log and slow query log don't work
- Add "storage/csv" to directories to be copied
2006-03-01 21:10:30 +01:00
tomas@poseidon.ndb.mysql.com
df6bb1994b Bug #17805 Cluster_replication database should be renamed to just cluster 2006-03-01 13:31:21 +01:00
kent@mysql.com
5d722a8491 Merge 2006-02-28 23:29:58 +01:00
monty@mysql.com
1e2e9e2856 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-02-25 21:54:34 +02:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
andrey@lmy004.
5ac46bb961 fix for bug #16400 2006-02-24 00:29:50 +01:00
holyfoot@mysql.com
32da648789 Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-02-22 10:53:44 +04:00
holyfoot@mysql.com
a94943df0c Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-02-22 10:33:42 +04:00
holyfoot@deer.(none)
796489ea1e Messgges corrected in mysql_upgrade script 2006-02-20 14:26:32 +04:00
holyfoot@deer.(none)
70fdbff94f --help option added to mysql_upgrade script 2006-02-18 14:55:31 +04:00
kent@mysql.com
a50023d772 mysqlimport.c:
Handle case where there is no snprintf()
libmysql.vcproj, mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
dbug.vcproj:
  Changed __WIN32__ to __WIN__
dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug.vcproj:
  Define __WIN__ for all targets
2006-02-18 08:46:18 +01:00
kent@mysql.com
9aca849da1 Makefile.am:
Add an extra -lpthread before first -lc, to solve link
  problems when statically linking with glibc 2.2.5
make_win_src_distribution.sh:
  Added copying of the include/mysql directory
2006-02-18 04:23:24 +01:00
joerg@mysql.com
0611ea3222 Surprising change: "mysqld-max" is resurrected in 5.1, but in a common package. 2006-02-17 14:14:56 +01:00
holyfoot@mysql.com
be02944df6 Merging 5.0->5.1 2006-02-17 11:26:03 +04:00
holyfoot@deer.(none)
053d90a234 WL#2645 (CHECK TABLE FOR UPGRADE)
necessary implementation in the server
mysql_upgrade script added
2006-02-17 10:52:32 +04:00
brian@zim.tangent.org
0c487a79c9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/dep-5.1
2006-02-12 13:27:56 -08:00
brian@zim.tangent.org
0a5a30bef3 This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 2006-02-12 13:26:30 -08:00
kent@mysql.com
eb9683442d Merge 2006-02-12 20:45:03 +01:00
kent@mysql.com
73de951abc Merge 2006-02-12 04:48:52 +01:00
kent@mysql.com
f9a23667b2 Merge 2006-02-12 04:33:50 +01:00
kent@mysql.com
1fe9126dc2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-02-12 01:35:30 +01:00
kent@mysql.com
eec5726806 make_binary_distribution.sh:
print => echo in shell script
2006-02-12 01:33:43 +01:00
joerg@mysql.com
181235d03b scripts/make_binary_distribution.sh : Care about the debug server in the 5.1 packages. 2006-02-07 19:06:55 +01:00
joerg@mysql.com
9f243de9c9 scripts/make_binary_distribution.sh :
Adaption of the 5.1.6 build clone to the new "storage" directory layer,
already done in the general tree by Jani.
2006-02-07 17:42:04 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
d955abd292 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-02-05 11:06:29 +02:00
jani@ua141d10.elisa.omakaista.fi
2dcc483e6c Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
dlenev@mysql.com
5845476009 Yet another addition to the fix for BUG#9412 "Triggers: should have trigger
privilege".

Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.
2006-02-02 13:36:07 +03:00
anozdrin@mysql.com
0a1f7e921b Fix for BUG#9412: Triggers: should have trigger privilege.
Implement table-level TRIGGER privilege to control access to triggers.
Before this path global SUPER privilege was used for this purpose, that
was the big security problem.

In details, before this patch SUPER privilege was required:
  - for the user at CREATE TRIGGER time to create a new trigger;
  - for the user at DROP TRIGGER time to drop the existing trigger;
  - for the definer at trigger activation time to execute the trigger (if the
    definer loses SUPER privilege, all its triggers become unavailable);

This patch changes the behaviour in the following way:
  - TRIGGER privilege on the subject table for trigger is required:
    - for the user at CREATE TRIGGER time to create a new trigger;
    - for the user at DROP TRIGGER time to drop the existing trigger;
    - for the definer at trigger activation time to execute the trigger
      (if the definer loses TRIGGER privilege on the subject table, all its
      triggers on this table become unavailable).
  - SUPER privilege is still required:
    - for the user at CREATE TRIGGER time to explicitly set the trigger
      definer to the user other than CURRENT_USER().

When the server works with database of the previous version (w/o TRIGGER
privilege), or if the database is being upgraded from the previous versions,
TRIGGER privilege is granted to whose users, who have CREATE privilege.
2006-02-01 13:28:45 +03:00
andrey@lmy004.
64e09bad66 sql_mode should be after on_completion and before comment
partial fix for bug #16407
WL#1034 (Internal CRON)
2006-01-31 23:29:03 +01:00
andrey@lmy004.
edf0185e4b post-push fix 2006-01-31 17:10:44 +01:00
andrey@lmy004.
2a60c11fef partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
WL#1034 (Internal CRON)
2006-01-31 16:01:27 +01:00
knielsen@mysql.com
2472ffc41b Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/x/mysql-5.1-new
2006-01-30 22:35:46 +01:00