summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-06-201-1/+2
|\ | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * Fix handling of command-line on Windows, missed as part of earlierjimw@mysql.com2005-06-201-1/+2
| | | | | | | | commit. (Bug #10840)
| * WL#2076: Added if(...) construct to mysqltestlars@mysql.com2005-06-161-30/+54
| | | | | | | | Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
* | Fix of 5.0 treelars@mysql.com2005-06-171-29/+54
| |
* | WL#2286 - Compile MySQL w/YASSL supportsvoj@mysql.com2005-06-121-2/+12
| | | | | | | | Fix for link failures on boxes with non-gnu compiler.
* | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-06-101-2/+22
|\ \ | |/ | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * Fix use of _cgets() to handle an input line that exceeds our buffer spacejimw@mysql.com2005-06-091-1/+20
| | | | | | | | before a newline is found. (Bug #10840)
| * Fix calculation of buffer size for _cgets() on Windows. (Bug #10841)jimw@mysql.com2005-06-081-1/+2
| |
* | Bug #10947 mysqlshow wildcard failure on Windows reggie@mdk10.(none)2005-06-101-1/+1
| |
* | Merge with 4.1monty@mysql.com2005-06-071-2/+1
|\ \ | |/
| * a compiler must see '#pragma implementation' *before*serg@serg.mylan2005-06-051-2/+1
| | | | | | | | '#pragma interface' (that comes with the #include'd header file)
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-06-061-5/+6
|\ \ | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| * | fixes for compiler warnings from VC6reggie@monster.2005-06-061-5/+6
| | |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-06-061-2/+0
|\ \ \ | |/ / | | | | | | into mysql.com:/home/my/mysql-5.0
| * | Bug#8610: The ucs2_turkish_ci collation fails with upper('i')bar@mysql.com2005-06-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UPPER/LOWER now can return a string with different length. mi_test1.c: Adding new arguments. Many files: Changeing caseup/casedn to return a result with different length than argument. sql_string.h: Removing unused method, mysql_priv.h: Removing unused method
* | | mergemonty@mysql.com2005-06-051-15/+16
|\ \ \ | |/ / |/| |
| * | Code cleanups during code reviewsmonty@mysql.com2005-06-011-15/+16
| | | | | | | | | | | | | | | Ensure we get error if INSERT IGNORE ... SELECT fails Fixed wrong key_part->key_length usage in index_merge
* | | client/mysql.ccserg@serg.mylan2005-06-031-9/+86
| | | | | | | | | | | | make print_field_types() somewhat more useful
* | | Merge of 4.1->5.0. This contained the fixes for GCC 4.0brian@zim.(none)2005-06-012-2/+3
|\ \ \ | |/ / |/| / | |/
| * Mergebrian@zim.(none)2005-06-011-1/+1
| |\
| | * Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. ↵brian@zim.(none)2005-06-011-1/+1
| | | | | | | | | | | | Removed a number of dumb things in ha_tina.
| * | tztime.cc:kent@mysql.com2005-06-021-1/+2
| | | | | | | | | | | | | | | | | | Set #pragma implementation" earlier Many files: Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
* | | Merge from 4.1msvensson@neptunus.(none)2005-05-262-2/+2
|\ \ \ | |/ /
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-05-262-2/+2
| |\ \ | | |/ | |/| | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| | * Add ifdefs to control when "#pragma implementation" should be usedmsvensson@neptunus.(none)2005-05-262-2/+2
| | | | | | | | | | | | Added some more ifdefs for "#pragma interface"
* | | Correction of merge mishandling in 'client/client_priv.h'.joerg@mysql.com2005-05-261-1/+1
| | |
* | | Manual merge.joerg@mysql.com2005-05-262-5/+16
|\ \ \ | |/ /
| * | Additions for --add-drop-databasebrian@zim.(none)2005-05-202-5/+16
| |/
* | Merge mysql.com:/home/jimw/my/mysql-5.0-buildjimw@mysql.com2005-05-181-1/+0
|\ \ | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | default.c:kent@mysql.com2005-05-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled use of GetSystemWindowsDirectory() when compiled with VC6 mysql.cc: Removed unused variable 'field' from print_warnings() libmysql.dsp: Added "my_chsize.c" and "my_seek.c" mysqlclient.dsp: Added "my_chsize.c"
* | | Fixes to merge from 4.1jimw@mysql.com2005-05-181-0/+3
| | |
* | | Resolve merge from 4.1jimw@mysql.com2005-05-181-46/+71
|\ \ \ | | |/ | |/|
| * | Resolve bugfix mergejimw@mysql.com2005-05-181-46/+71
| |\ \
| | * | Small optimization to bug fix, from Monty.jimw@mysql.com2005-05-181-4/+5
| | | |
| | * | Fix crash in mysqldump -c triggered by tables with a large number of longjimw@mysql.com2005-05-081-43/+65
| | | | | | | | | | | | | | | | field names. (Bug #10286)
* | | | mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table ↵gbichot@quadita2.mysql.com2005-05-181-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | def cache for that, to easily check the storage engine supports DELAYED).
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-10251jimw@mysql.com2005-05-171-40/+22
|\ \ \ \ | |_|_|/ |/| | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | Support quoted identifiers containing single and double quotes injimw@mysql.com2005-05-061-40/+22
| | | | | | | | | | | | | | | | mysqltest. (Bug #10251)
* | | | Merge with 4.1 to get fix for memory leakmonty@mysql.com2005-05-161-3/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Fix memory leakmonty@mysql.com2005-05-161-3/+4
| | | |
| * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-05-161-2/+17
| |\ \ \ | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1
* | \ \ \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-05-162-3/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * \ \ \ \ mergedserg@serg.mylan2005-05-147-46/+73
| |\ \ \ \ \
| * \ \ \ \ \ Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0geert@kriem.kemuri.org2005-04-291-3/+11
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
| * | | | | | Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0geert@kriem.kemuri.org2005-04-271-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
| * | | | | | | Removing useless mysql_field_seekgeert@kriem.kemuri.org2005-04-251-2/+1
| | | | | | | |
| * | | | | | | Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0geert@kriem.kemuri.org2005-04-252-15/+27
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
| * | | | | | | | \W enables show warnings, \w disables; Showing message while interactive ↵geert@kriem.kemuri.org2005-04-141-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using the \w and \W commands; using strmov instead of my_strdup; removed case for options, my_getopt does it
| * | | | | | | | Removing for-loop in print_warnings()geert@kriem.kemuri.org2005-04-081-12/+1
| | | | | | | | |
| * | | | | | | | Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0geert@kriem.kemuri.org2005-04-082-2/+81
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0