summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge jwinstead@production.mysql.com:my/mysql-5.0-11045jimw@mysql.com2005-07-0611-28/+24
|\
| * Clean up warnings and build problems on Windows. (Bug #11045)jimw@mysql.com2005-06-1811-28/+24
* | Merge igor-inspiron.creware.com:/home/igor/mysql-5.0igor@igor-inspiron.creware.com2005-07-061-0/+4
|\ \
| * | view.result, view.test:igor@igor-inspiron.creware.com2005-07-061-0/+4
* | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-07-061-2/+2
|\ \ \ | |/ /
| * | Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0marko@hundin.mysql.fi2005-07-061-2/+2
| |\ \
| | * | InnoDB: Make the srv_thread_concurrency checks more consistent.marko@hundin.mysql.fi2005-07-061-2/+2
* | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-07-0613-26/+143
|\ \ \ \ | |/ / /
| * | | init_db.sql:kent@mysql.com2005-07-061-1/+1
| * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com2005-07-066-9/+46
| |\ \ \
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-07-063-1/+30
| | |\ \ \ | | | |/ / | | |/| |
| | | * | "Fix" for bug #11394 "Recursion in SP crash server" and bug #11600dlenev@brandersnatch.localdomain2005-07-013-1/+30
| | * | | Merge mysql.com:/home/jimw/my/mysql-5.0-6903jimw@mysql.com2005-07-051-1/+10
| | |\ \ \
| | | * | | Fix SHOW CREATE VIEW to handle ANSI_QUOTES mode. (Bug #6903)jimw@mysql.com2005-06-151-1/+10
| | * | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-07-052-7/+6
| | |\ \ \ \
| | | * \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-11440jimw@mysql.com2005-07-051-6/+4
| | | |\ \ \ \
| | | | * | | | Restore creation of files for temporary tables in the tmpdir,jimw@mysql.com2005-06-211-6/+4
| | | * | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-11330jimw@mysql.com2005-07-051-1/+2
| | | |\ \ \ \ \
| | | | * | | | | Fix crash when an entry was added to the mysql.tables_privjimw@mysql.com2005-06-201-1/+2
| * | | | | | | | Mergekent@mysql.com2005-07-061-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Makefile.am:kent@mysql.com2005-07-051-2/+2
| * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-10214jimw@mysql.com2005-07-052-0/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make status of NO_BACKSLASH_ESCAPES mode known to the client sojimw@mysql.com2005-06-232-0/+11
| * | | | | | | | | Merging 4.1 into 5.0mats@mysql.com2005-07-051-0/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1mats@mysql.com2005-07-051-0/+15
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizesmats@mysql.com2005-07-051-0/+15
| * | | | | | | | | | Mergebell@sanja.is.com.ua2005-07-054-15/+82
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-5.0bell@sanja.is.com.ua2005-07-053-13/+73
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | fixed environment creation and cleaning up for processing view one by one dur...bell@sanja.is.com.ua2005-07-053-13/+73
| | * | | | | | | | | | | added processing of view grants to table grants (BUG#9795)bell@sanja.is.com.ua2005-07-051-2/+9
* | | | | | | | | | | | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1mskold@mysql.com2005-07-062-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed handling of failed primary key update in INSERT .. ON DUPLICATE KEY UPD...mskold@mysql.com2005-07-062-6/+11
| * | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-07-052-38/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-07-053-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0bell@sanja.is.com.ua2005-07-052-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | post-merge fixesbell@sanja.is.com.ua2005-07-051-3/+2
| | * | | | | | | | | | | | | mergebell@sanja.is.com.ua2005-07-052-0/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2005-07-0411-42/+80
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | mergebell@sanja.is.com.ua2005-07-041-2/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | temporary tables of subquery in the from clause just skipped during processin...bell@sanja.is.com.ua2005-06-231-2/+15
| | | * | | | | | | | | | | | | abort storing query to query cache if warnings appeared (BUG#9414)bell@sanja.is.com.ua2005-06-281-0/+2
| * | | | | | | | | | | | | | | mergebell@sanja.is.com.ua2005-07-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | fixed var_samp printing (BUG#10651)bell@sanja.is.com.ua2005-07-021-1/+2
* | | | | | | | | | | | | | | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1mskold@mysql.com2005-07-052-37/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed indentationmskold@mysql.com2005-07-041-3/+3
| * | | | | | | | | | | | | | Changed delete_row to always get key from record argument, removed unused fun...mskold@mysql.com2005-06-291-19/+0
| * | | | | | | | | | | | | | Changed delete_row to always get key from record argumentmskold@mysql.com2005-06-292-19/+14
* | | | | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-07-041-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | BUG#9814: post-review fixes: clear thd->net.no_send error after SP instructionsergefp@mysql.com2005-07-041-4/+4
| * | | | | | | | | | | | | | | Fix for BUG#9814: Clear thd->net.no_send_error before each SP instruction sergefp@mysql.com2005-07-041-0/+6