summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-07-191-10/+28
|\
| * Merge mysql.com:/home/jimw/my/mysql-4.1-7249jimw@mysql.com2005-07-191-11/+29
| |\
| | * Fix handling of datadir by mysqld_safe to support specifying ajimw@mysql.com2005-06-241-11/+29
| * | - reverted adding mysql-test/t/*.def to the distribution (it is not supported...lenz@mysql.com2005-07-081-1/+0
* | | Fixed BUG#11365: Stored Procedure: Crash on Procedure operationpem@mysql.com2005-07-082-21/+36
* | | - manual merge of the addition of including mysqlt-test/t/*.deflenz@mysql.com2005-07-081-0/+1
|\ \ \ | |/ /
| * | - added mysql-test/t/*.def to the source and binary distributionslenz@mysql.com2005-07-081-0/+1
* | | - manual merge of the make_binary_distribution.sh ChangeSet propagationlenz@mysql.com2005-07-061-1/+1
|\ \ \ | |/ /
| * | Merge mysql.com:/space/my/mysql-4.0-buildlenz@mysql.com2005-07-061-0/+11
| |\ \
| | * | - backported a change for make_binary_distribution.sh from 5.0 for easier bui...lenz@mysql.com2005-07-061-0/+11
* | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-07-051-5/+13
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/home/jimw/my/mysql-4.1-10986jimw@mysql.com2005-07-051-5/+13
| |\ \ \
| | * | | If mysql_config is a symlink, resolve it before trying to find the lib andjimw@mysql.com2005-06-241-5/+13
| | | |/ | | |/|
* | | | Mergebell@sanja.is.com.ua2005-07-052-1/+6
|\ \ \ \
| * | | | added processing of view grants to table grants (BUG#9795)bell@sanja.is.com.ua2005-07-052-1/+6
* | | | | Merge with 4.1monty@mysql.com2005-07-031-0/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | make_win_src_distribution.sh:kent@mysql.com2005-06-281-0/+3
| |/ /
* | | - make sure to include mysql-test/t/*.sql files in the binary distributions a...lenz@mysql.com2005-06-081-1/+1
* | | Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0igor@rurik.mysql.com2005-06-071-3/+17
|\ \ \ | |/ /
| * | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-06-071-2/+1
| |\ \
| * | | BUG#7967 Fix mysqlhotcopy --record-log-positionelliot@mysql.com2005-06-061-3/+17
* | | | - manual merge of mysql.spec.shlenz@mysql.com2005-06-071-2/+1
|\ \ \ \ | | |/ / | |/| |
| * | | - BUG#10676: don't install "make_win_src_distribution" and "make_win_binary_d...lenz@mysql.com2005-06-071-2/+1
| |/ /
* | | Merge of 4.1 -> 5.0lenz@mysql.com2005-06-011-3/+0
|\ \ \ | |/ /
| * | Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-06-011-3/+0
| |\ \ | | |/
| | * - removed references to some obsolete files (BUG#10824)lenz@mysql.com2005-06-011-3/+0
* | | scripts/mysqld_safe.shtim@siva.hindu.god2005-05-271-1/+1
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-buildjimw@mysql.com2005-05-182-7/+9
|\ \ \
| * | | make_win_src_distribution.sh:kent@mysql.com2005-05-181-6/+8
| * | | make_binary_distribution.sh:kent@mysql.com2005-05-181-1/+1
* | | | Merge mysql.com:/usr/home/ram/work/mysql-5.0-buildramil@mysql.com2005-05-181-2/+2
|\ \ \ \ | |/ / /
| * | | make_binary_distribution.sh:matt@mysql.com2005-05-181-2/+2
* | | | Bug#10246 - Parser: bad syntax for GRANT EXECUTEacurtis@xiphis.org2005-05-172-4/+10
|/ / /
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-05-091-4/+1
|\ \ \
| * \ \ Manual merge of fix for bug #9913 into 5.0 tree.dlenev@mysql.com2005-05-091-4/+1
| |\ \ \ | | |/ /
| | * | don't use tmp file for such a trivialityserg@sergbook.mylan2005-05-091-4/+1
* | | | make_binary_distribution.sh:mwagner@ultrafly.mysql.com2005-05-091-0/+9
|/ / /
* | | make_binary_distribution.sh:mwagner@ultrafly.mysql.com2005-05-091-0/+4
* | | make_binary_distribution.sh:mwagner@ultrafly.mysql.com2005-05-081-0/+16
* | | Resolve merge of fix for #8166.jimw@mysql.com2005-05-022-0/+7
|\ \ \
| * | | Add Create_routine_priv, Alter_routine_priv, and Execute_priv privilegesjimw@mysql.com2005-02-072-0/+7
* | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0joerg@mysql.com2005-04-261-10/+48
|\ \ \ \
| * | | | Added a check for config-file.jani@ua141d10.elisa.omakaista.fi2005-04-261-1/+1
| * | | | Fixed Bug#9834, "mysqld_multi --config-file parameter requiresjani@ua141d10.elisa.omakaista.fi2005-04-261-1/+10
| * | | | Fixed Bug#6221, "mysqld_multi doesn't read the init_connectjani@ua141d10.elisa.omakaista.fi2005-04-261-1/+27
| * | | | Fixed Bug#9835: mysqld_multi --help won't output help if there arejani@ua141d10.elisa.omakaista.fi2005-04-261-10/+13
* | | | | Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#...joerg@mysql.com2005-04-262-2/+2
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Step 1 of the switch to support configuration with NPTL:joerg@mysql.com2005-04-202-2/+2
* | | | Informing of deprecation of mysql_tableinfo by INFORMATION_SCHEMA (andguilhem@mysql.com2005-04-241-7/+25
* | | | Update for VARCHAR and remove 4.1-specific actions.acurtis@xiphis.org2005-04-181-39/+7