summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 4.0 to get fix for mysqlbinlogmonty@narttu.mysql.fi2003-10-071-1/+9
|\
| * Simple cleanupsmonty@narttu.mysql.fi2003-10-071-1/+9
| |
* | Merge with 4.0.16monty@narttu.mysql.fi2003-10-073-81/+95
|\ \ | |/
| * Fix for the bug #1336 mysql.cc assumes DATABASE() doesn't return NULLram@gw.mysql.r18.ru2003-10-061-1/+1
| |
| * Added resetting of replace_result patterns after --exec command in mysqltest ↵dlenev@mysql.com2003-09-291-0/+4
| | | | | | | | (in order to be consistent with ordinary query execution).
| * Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog)monty@narttu.mysql.fi2003-09-292-20/+21
| | | | | | | | | | | | | | Add quoting for use `database` for mysqlbinlog Removed test ins0000001 Add support for --replace for exec in mysqltest Don't refer to install dir in mysqlbinlog.result
| * #1169: Add --exec command to mysqltestram@gw.mysql.r18.ru2003-09-241-0/+65
| |
| * Code cleanup of new patchesmonty@narttu.mysql.fi2003-09-231-67/+58
| |
| * Bugfix for bug #1340, style fix before pushdlenev@mysql.com2003-09-191-4/+2
| |
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0dlenev@mysql.com2003-09-191-7/+10
| |\ | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340
| | * Fix for bug #1340 (More careful checks if we met proper ↵dlenev@mysql.com2003-09-191-7/+10
| | | | | | | | | | | | Create_file_log_event before Append or Exec event we are processing now)
| * | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0vva@eagle.mysql.r18.ru2003-09-191-2/+18
| |\ \ | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1073/mysql-4.0
| | * | fixed bug #1073 vva@eagle.mysql.r18.ru2003-09-011-2/+18
| | | | | | | | | | | | | | | | (Replication LOAD DATA INFILE mysqlbinlog doesn't cleanup tmp files)
| * | | Fixed Bug#1291, client displays wrong prompt when in the middle ofjani@rhols221.adsl.netsonic.fi2003-09-171-2/+4
| | |/ | |/| | | | | | | backticks.
| * | Fix for BUG#1258 (Trying to use the mysqlbinlog with -h and -u option gives ↵guilhem@mysql.com2003-09-121-2/+2
| | | | | | | | | | | | | | | | | | segmentation fault). Fix is just initializing "host" (and "user") with 0, not a string.
* | | Move init_compiled_charsets to own filemonty@mishka.mysql.fi2003-10-061-16/+13
| | | | | | | | | | | | | | | Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used Simple code cleanup
* | | SCRUMhf@deer.(none)2003-09-191-4/+4
| | | | | | | | | | | | | | | | | | | | | embedded library hash_insert renamed to my_hash_insert to avoid name intersection with another libraries is there better idea?
* | | SCRUM:hf@deer.(none)2003-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | embedded library I decided to get rid of #define mysql_some_function in mysql.h It puzzles users and makes problems with dynamic libraries Finally, there are only two functions left, that are covered with the #define-s and it won't hurt performance at all
* | | merge with 4.1 treemonty@mashka.mysql.fi2003-09-115-183/+190
|\ \ \
| * \ \ merge with 4.0.15monty@mashka.mysql.fi2003-09-112-78/+94
| |\ \ \ | | |/ /
| | * | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0vva@eagle.mysql.r18.ru2003-09-081-4/+5
| | |\ \ | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
| | | * \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0vva@eagle.mysql.r18.ru2003-09-081-4/+5
| | | |\ \ | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
| | | | * | fixed Bug #1184 (change type of opt_ignore_lines to longlong)vva@eagle.mysql.r18.ru2003-09-061-4/+5
| | | | | |
| | * | | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0vva@eagle.mysql.r18.ru2003-09-081-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0
| | | * | | added space after first '--' in the long '----....' comment line in mysqldumpvva@eagle.mysql.r18.ru2003-09-061-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | just to make it compatible with the manual (fixed bug #1056)
| | * | | after merge fixesmonty@mashka.mysql.fi2003-09-051-1/+1
| | | | |
| | * | | Merge with 3.23monty@mashka.mysql.fi2003-09-051-71/+87
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Better quoting patch for mysqldumpmonty@narttu.mysql.fi2003-09-031-70/+85
| | | | |
| | | * | proper obligatory quoting of identifiers in mysqldump<->server communication ↵serg@serg.mylan2003-09-021-25/+27
| | | | | | | | | | | | | | | | | | | | (unrelated from command-line options)
| * | | | After merge fixes.monty@mashka.mysql.fi2003-09-111-1/+0
| | | | | | | | | | | | | | | | | | | | Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
| * | | | mergemonty@narttu.mysql.fi2003-09-035-104/+96
| |\ \ \ \
| | * \ \ \ merge with 4.0.15monty@narttu.mysql.fi2003-08-295-104/+96
| | |\ \ \ \ | | | |/ / /
| | | * | | Portability fixesmonty@narttu.mysql.fi2003-08-281-59/+0
| | | | | |
| | | * | | Add column names for metadata when running mysql with -Tmonty@narttu.mysql.fi2003-08-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324
| | | * | | vio ssl structure renames (to get rid of ending _)monty@narttu.mysql.fi2003-08-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added TCP/IP read/write timeout for windows Check on windows if second server is started with same TCP/IP port
| | | * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2003-08-221-3/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | | * | | 2 minor edits, plusguilhem@mysql.com2003-08-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning" and fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog". Now we don't always write the non-trans update immediately to the binlog; if there is something in the binlog cache we write it to the binlog cache (because the non-trans update could depend on a trans table which was modified earlier in the transaction); then in case of ROLLBACK, we write the binlog cache to the binlog, wrapped with BEGIN/ROLLBACK. This guarantees that the slave does the same updates. For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated, we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog (because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO SAVEPOINT in the binlog. Apart from this rare case of updates of mixed table types in transaction, the usual way is still clear the binlog cache at ROLLBACK, or chop it at ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which is fine). Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@narttu.mysql.fi2003-08-221-5/+24
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| | | | * | | | Move test that uses many tables (in query_cache.test) to separate test so ↵monty@narttu.mysql.fi2003-08-221-5/+24
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | that we can get it 'skipped' instead of 'failed' on system where we can't open many files.
| | | * | | | comment addedserg@serg.mylan2003-08-201-0/+7
| | | |/ / /
| | | * | | Fix for BUG#1096 which is:guilhem@mysql.com2003-08-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | "mysqlbinlog does not comment the original LOAD DATA INFILE if it has a "use xx""
| | | * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2003-08-191-31/+49
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | | * | Fixes for BUG#1091,1092,1093. Synopsis of these bugs:guilhem@mysql.com2003-08-191-31/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqlbinlog segfaults if --position is just before Exec_load event mysqlbinlog prints uncommented warnings if --database and compiled with debug mysqlbinlog --database does not filter LOAD DATA INFILE
| | | * | | Fixed a limitation bug in mysqlimport. sql_statement was designed tojani@rhols221.adsl.netsonic.fi2003-08-161-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contain max 1280 characters, but sometimes in rare cases when --columns was used, more than 1280 characters was needed. This is case when a lot of columns was specified using this option. Raised the max value to 8448, which should be enough.
* | | | | #1169: Add --exec command to mysqltestram@mysql.r18.ru2003-09-081-0/+65
|/ / / /
* | | | merge commit, hope that none of bar and dlenev changes werekostja@oak.local2003-09-031-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | lost.
| * \ \ \ Merge oak.local:/home/kostja/mysql/mysql-4.1-rootkostja@oak.local2003-08-071-3/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into oak.local:/home/kostja/mysql/mysql-4.1
| | * \ \ \ Merge oak.local:/home/kostja/mysql/mysql-4.1-rootkostja@oak.local2003-08-071-3/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into oak.local:/home/kostja/mysql/mysql-4.1
| | | * \ \ \ manual mergekostja@oak.local2003-07-311-3/+6
| | | |\ \ \ \
| | | | * \ \ \ Merge oak.local:/home/kostja/mysql/mysql-4.1-rootkostja@oak.local2003-07-171-3/+6
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into oak.local:/home/kostja/mysql/mysql-4.1
View Lorry Controller Status