summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@gluh.mysql.r18.ru2005-01-272-4/+14
|\ | | | | | | into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
| * A fix: information_schema test fails on Mac OSXgluh@gluh.mysql.r18.ru2005-01-272-4/+14
| |
* | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-01-273-7/+14
|\ \ | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-5000
| * \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-273-7/+14
| |\ \ | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| | * | item_timefunc.cc:bar@mysql.com2005-01-271-5/+12
| | | | | | | | | | | | | | | | CAST now always return a well-formed character string.
| | * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2005-01-262-2/+2
| | |\ \ | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1
| | | * \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2005-01-242-2/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1
| | | | * | A fix (Bug #8015: server refuses to start with long basedir path).ram@gw.mysql.r18.ru2005-01-212-2/+2
| | | | | |
* | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2005-01-277-158/+303
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-5000
| * | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0patg@patrick-galbraiths-computer.local2005-01-2616-45/+91
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
| * | | | | | changes to get rid of compile warnings in both ha_federated.cc and ↵patg@patrick-galbraiths-computer.local2005-01-262-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ha_federated.h
| * | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0patg@patrick-galbraiths-computer.local2005-01-257-144/+288
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
| | * \ \ \ \ \ Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0patg@patrick-galbraiths-computer.local2005-01-247-144/+288
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
| | | * | | | | | -Added quote_data and needs_quotes (moved from federated handler.patg@pc248.lfp.kcls.org2005-01-206-182/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -New tests and results logging_ok: Logging to logging@openlogging.org accepted ha_federated.h: removed quote_data and type_quote (now in the Field class) ha_federated.cc: moved quote_data and type_quote to field class field.h: new methods quote_data and needs_quotes declared field.cc: new field class methods quote_data and needs_quotes (per Monty's request) federated.test: more tests, joins, index tests have_federated_db.require: new name of federated system var federated.result: new test results for federated handler have_federated_db.inc: changed name of variable in test due to change in vars sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler ha_federated.cc: implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions.
| | | * | | | | | progress in fixing multi-key, two-byte prefix keys.patg@patrick-galbraiths-computer.local2005-01-132-13/+140
| | | | | | | | |
| | | * | | | | | change to have_<> variable for federated enginepatg@patrick-galbraiths-computer.local2005-01-131-1/+1
| | | | | | | | |
* | | | | | | | | Test bug: Memory leak in archive handler.ingo@mysql.com2005-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a call to close the meta file after a repair.
* | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2005-01-264-7/+14
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-5000
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-01-268-14/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
| | * | | | | | | | timed_mutexes moved to include/my_sys.h and mysys/my_static.cram@gw.mysql.r18.ru2005-01-262-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid linking problems referring to the variable from .c programs.
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-01-267-26/+65
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
| * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-01-264-5/+14
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
| | * | | | | | | | | Fix for bug #7637: "Test failure: 'user_limits' on QNX and 64-bit systems"dlenev@brandersnatch.localdomain2005-01-204-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made user_limits.test scheduling independant (this solves failure on QNX). Made sys_var_max_user_conn variable int sized. Changed max_user_connections from ulong to uint to be able to use it in sys_var_max_user_conn::value_ptr() (solves failures on 64-bit platforms).
* | | | | | | | | | | Merge from 4.1ingo@mysql.com2005-01-263-18/+59
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Archive fix by Ingo. Innodb compile fix by Monty.
| * | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-262-9/+51
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| * | | | | | | | | | Test Bug: Memory leaks in the archive handler.ingo@mysql.com2005-01-263-18/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved initialization code into a new init function. Added a new cleanup function. Added a call to close the meta file.
| * | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-265-20/+14
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-251-1/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-246-27/+23
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| | * | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-201-1/+17
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| | | * | | | | | | | | | BUG#6034 - Error code 124: Wrong medium type.ingo@mysql.com2005-01-191-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version for 4.1. Committed for merge. If the result table is one of the select tables in INSERT SELECT, we must not disable the result tables indexes before selecting. mysql_execute_command() detects the match for other reasons and adds the flag OPTION_BUFFER_RESULT to the 'select_options'. In this case the result is put into a temporary table first. Hence, we can defer the preparation of the insert table until the result is to be used.
* | | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2005-01-2613-38/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-5000
| * | | | | | | | | | | | Fixes for windows compilation bugsgeorg@beethoven.site2005-01-266-12/+12
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (After review of cs georg:1.1800 by Monty)
| * | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ram@gw.mysql.r18.ru2005-01-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/5.0
| | * | | | | | | | | | | CSC#4385: slow sorting for UTF8 large table:bar@mysql.com2005-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | my_strnxfrm_utf8 now requires 2 bytes per character in filesort key, instead of 3 bytes per character. Shorter filesort keys make sorting faster.
| * | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ram@gw.mysql.r18.ru2005-01-262-9/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/5.0
| | * | | | | | | | | | | Mergetomas@poseidon.ndb.mysql.com2005-01-262-9/+50
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-01-262-9/+51
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | | * | | | | | | | | Bug#8101 unique indexes which attribute are _not_ specified in the order of ↵tomas@poseidon.ndb.mysql.com2005-01-262-5/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the table does not work
| | | | * | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-01-261-4/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | | | * \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-01-251-4/+1
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | | | | * \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-01-251-4/+1
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | | | | | * | | | | | | | | changed from using column names to column id in ndb setBound in ha_ndbclustertomas@poseidon.ndb.mysql.com2005-01-251-4/+1
| | | | | | | |/ / / / / / / /
| * | | | | | | | | | | | | | after review fixup (bug #8129: help.test fails using --ps-protocol)ram@gw.mysql.r18.ru2005-01-261-0/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | a fix (bug #8129: help.test fails using --ps-protocol)ram@gw.mysql.r18.ru2005-01-261-1/+2
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1serg@serg.mylan2005-01-261-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| | * | | | | | | | | | | | innobase/include/univ.iserg@serg.mylan2005-01-261-2/+3
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove a change that broke the test
| * | | | | | | | | | | | mergedserg@serg.mylan2005-01-252-12/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | / / / / | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Cleanups during reviewmonty@mysql.com2005-01-252-12/+4
| | |/ / / / / / / / /
| | * | | | | | | | | Fix for failing INSERT IGNORE in test ndb_insertmskold@mysql.com2005-01-251-5/+5
| | |/ / / / / / / /
View Lorry Controller Status