summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Bug #12829bar@mysql.com2005-08-301-0/+1
* ha_blackhole.cc:pgalbraith@mysql.com2005-08-301-0/+1
* ha_blackhole.cc:pgalbraith@mysql.com2005-08-291-0/+1
* Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@frost.snake.net2005-08-292-0/+27
|\
| * ctype_utf8.result, ctype_utf8.test, item.cc:bar@mysql.com2005-08-291-1/+7
| * Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-08-292-0/+21
| |\
| | * Bug#12371 executing prepared statement fails (illegal mix of collations)bar@mysql.com2005-08-062-0/+21
* | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@frost.snake.net2005-08-272-6/+8
|\ \ \ | |/ / |/| |
| * | set_var.cc:paul@frost.snake.net2005-08-271-2/+4
| * | mysqld.cc:paul@frost.snake.net2005-08-271-4/+4
* | | typo to DBUG_RETURN fixedpatg@radha.local2005-08-261-1/+1
* | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1patg@radha.local2005-08-262-4/+7
|\ \ \
| * | | ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878, p...patg@radha.local2005-08-262-4/+7
* | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@a193-229-222-105.elisa-laajakaista.fi2005-08-251-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0jani@a193-229-222-105.elisa-laajakaista.fi2005-08-251-0/+1
| |\ \ \
| | * | | Several fixes for Netware.jani@a193-229-222-105.elisa-laajakaista.fi2005-08-241-3/+13
* | | | | mergedserg@sergbook.mysql.com2005-08-253-16/+8
|\ \ \ \ \
| * \ \ \ \ Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@sergbook.mysql.com2005-08-233-18/+9
| |\ \ \ \ \
| | * | | | | after pull cleanupserg@sergbook.mysql.com2005-08-223-18/+9
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2005-08-241-48/+46
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2005-08-241-48/+46
| |\ \ \ \ \ \
| | * | | | | | Review fixesmonty@mishka.local2005-08-241-48/+46
| | |/ / / / /
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-12302jimw@mysql.com2005-08-244-4/+28
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.0heikki@hundin.mysql.fi2005-08-241-1/+25
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-08-241-1/+25
| | * | | | | Some minor fixes for Netware. These were required after we started buildingjani@a193-229-222-105.elisa-laajakaista.fi2005-08-181-0/+1
| * | | | | | Mergekent@mysql.com2005-08-233-3/+3
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | mysqld.dsp:kent@mysql.com2005-08-183-3/+3
* | | | | | | Use the hostname with which the user authenticated when determining whichjimw@mysql.com2005-08-222-9/+23
|/ / / / / /
* | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-08-221-1/+9
|\ \ \ \ \ \
| * | | | | | Fix bug #11718 query with function, join and order by returns wrong type.evgen@moonbone.local2005-08-171-1/+9
| |/ / / / /
* | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-08-2110-23/+94
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1sasha@asksasha.com2005-08-203-5/+75
| |\ \ \ \ \
| | * | | | | updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication). sasha@asksasha.com2005-08-184-48/+65
| | * | | | | Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1sasha@asksasha.com2005-08-173-7/+60
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | patch for BUG#4680 - drop database breaking replication if there were extra f...sasha@asksasha.com2005-08-033-7/+60
| * | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2005-08-191-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1patg@radha.local2005-08-191-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | BUG #12498 Fixed mispellingpatg@radha.local2005-08-191-1/+1
| * | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2005-08-195-14/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug#11338 Fixes from review (identical functionality).elliot@mysql.com2005-08-195-14/+17
| * | | | | | | | distinct.test, distinct.result:igor@rurik.mysql.com2005-08-191-3/+1
| |/ / / / / / /
* | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-08-191-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge eel.(none):/home/jonas/src/mysql-4.1jonas@eel.(none)2005-08-181-1/+4
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | bug#12118 - ndb alter table data loss jonas@eel.(none)2005-08-181-1/+4
* | | | | | | | Changes for Netware. This is needed when building against newer Libcjani@a193-229-222-105.elisa-laajakaista.fi2005-08-181-0/+1
|/ / / / / / /
* | | | | | | Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1elliot@mysql.com2005-08-173-8/+16
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | BUG#11338 (logging of prepared statement w/ blob type)elliot@mysql.com2005-08-173-8/+16
| | |/ / / / | |/| | | |
* | | | | | sql_select.cc:igor@rurik.mysql.com2005-08-151-1/+1
* | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-11796jimw@mysql.com2005-08-151-1/+5
|\ \ \ \ \ \