summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2004-09-0629-274/+394
|\ | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5291
| * memory leak fixedbell@sanja.is.com.ua2004-09-051-3/+5
| |
| * Merge with 4.0 to get latest bug fixesmonty@mysql.com2004-09-0427-269/+376
| |\
| | * sql_yacc.yy:paul@kite-hub.kitebird.com2004-09-031-1/+1
| | | | | | | | | | | | Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
| | * A fix (Bug #4980: union statement with () union () order by produces wrong ↵ram@gw.mysql.r18.ru2004-09-031-0/+4
| | | | | | | | | | | | explain).
| | * errmsg.txt:paul@kite-hub.kitebird.com2004-09-0222-44/+350
| | | | | | | | | | | | Add GPL comment
| | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ram@gw.mysql.r18.ru2004-09-021-0/+13
| | |\ | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5232
| | | * A fix (Bug #5232: CREATE TABLE ... SELECT can deadlock itself).ram@gw.mysql.r18.ru2004-08-271-0/+13
| | | |
| | * | Fix for bug #5302miguel@hegel.txg.br2004-09-021-1/+1
| | | |
| | * | Fix for bug #5302miguel@hegel.txg.br2004-09-011-0/+7
| | | |
| | * | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0lenz@mysql.com2004-09-011-221/+0
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| | | * \ Merge mysql.com:/space/my/mysql-4.0lenz@mysql.com2004-09-011-221/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0-build
| | | | * | - removed swedish errmsg.OLDlenz@mysql.com2004-09-011-221/+0
| | | | | |
| | * | | | ha_innodb.cc:heikki@hundin.mysql.fi2004-09-011-2/+3
| | |/ / / | | | | | | | | | | | | | | | If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading
| * | | | A fix for bug#4368 '"like" fails in PreparedStatement, crashes konstantin@mysql.com2004-09-031-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server': the bug occurs when arguments of LIKE function are in differentcharacter sets. If these character sets are compatible, we create an item-converter. In prepared mode, this item needs to be created in memory of current prepared statement.
* | | | | A fix (Bug #5291: float -> string, truncation, sometimes without warning).ram@gw.mysql.r18.ru2004-09-031-1/+1
|/ / / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-09-0314-98/+138
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | | | Remove extra '/' after mysql_real_data_homemonty@mysql.com2004-09-034-4/+4
| | | | | | | | | | | | | | | | | | | | Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-09-0210-94/+134
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * | | | After merge fixesmonty@mysql.com2004-09-022-2/+1
| | | | | |
| | * | | | Merge with 4.0monty@mysql.com2004-09-016-82/+118
| | |\ \ \ \ | | | |/ / /
| | | * | | Added global my_getopt_error_reporter function pointer which is ram@gw.mysql.r18.ru2004-08-312-3/+3
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used in the handle_options() function (instead of using additional handle_option() parameter). The default value of the my_getopt_error_reporter is default_reporter(). One can set it to other functions if case of need.
| | | * | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-08-307-104/+149
| | | |\ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | | * | log.cc:rburnett@build.mysql.com2004-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixed missing * in comment in setup_windows_event_source
| | | | * | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-08-292-7/+17
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | | | * | Fix for BUG#4500 "set character set replicates incorrectly"guilhem@mysql.com2004-08-292-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately. Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS); such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used). I have written a test and it works, but I'm not pushing the test as it requires building with all charsets. I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar.
| | | | * | | Code style fixes.monty@mysql.com2004-08-284-98/+111
| | | | |/ / | | | | | | | | | | | | | | | | | | Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
| | | | * | Compile all charset conversion tables if --with-extra-charsets=allbar@mysql.com2004-08-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | or --with-extra-charsets=complex is given.
| | | | * | table.cc:bar@mysql.com2004-08-271-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | Bug #4558 Escape handling error for ENUM values in SJIS encoding
| | | | * | win1251.conf:bar@mysql.com2004-08-271-2/+2
| | | | |/ | | | | | | | | | | | | | | | | | | | | Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed. bug#5110
| | | * | typo fixedserg@serg.mylan2004-08-301-1/+1
| | | |/
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-09-0126-46/+65
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-08-315-12/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | | * | | Review of new pushed code (Indentation fixes and simple optimizations)monty@mysql.com2004-08-315-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database Safety fix for mailformed MERGE files
* | | | | | A fix and test case for Bug#4231 "Wrong result with MYSQL_TIMEkonstantin@mysql.com2004-09-021-20/+30
|/ / / / / | | | | | | | | | | | | | | | | | | | | parameters": when unpacking binary time recieved from client, handle the case when length is 0: it means all MYSQL_TIME members are zero.
* | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2004-09-0256-480/+854
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.4815
| * | | | | fixed typo in group_concat printing (BUG#5161)bell@sanja.is.com.ua2004-09-011-1/+1
| | | | | |
| * | | | | Allow IN to convert arguments into Unicode in some cases.bar@mysql.com2004-09-013-10/+63
| | | | | |
| * | | | | Move collation aggregation with superset conversion codebar@mysql.com2004-09-013-21/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from Item_bool_func2 into DTCollation to make it reusable for other types of items.
| * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-08-318-115/+64
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-not-4.1
| | * | | | after review patchbell@sanja.is.com.ua2004-08-318-70/+57
| | | | | |
| | * | | | NOT elimination moved in parsing (suggested by Monty)bell@sanja.is.com.ua2004-08-294-49/+11
| | | | | |
| * | | | | Merge mskold@build.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2004-08-312-17/+39
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
| | * | | | | Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at ↵mskold@mysql.com2004-08-312-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | insert
| | * | | | | Merge mskold@build.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2004-08-311-14/+24
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
| | | * | | | | Enabled HA_NULL_IN_KEY supportmskold@mysql.com2004-08-311-14/+24
| | | |/ / / /
| * | | | | | Better easier to call error message format.bar@mysql.com2004-08-3124-29/+26
| | |_|/ / / | |/| | | |
| * | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-08-317-77/+75
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames
| | * | | | | Change Item_arena::state to enumsergefp@mysql.com2004-08-313-16/+16
| | |/ / / /
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-304-61/+59
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
View Lorry Controller Status