summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* UCS2 and UTF8 are in separate files nowbar@bar.mysql.r18.ru2003-05-214-1026/+1053
* Merge abarkov@build.mysql.com:/home/bk/mysql-4.1bar@bar.mysql.r18.ru2003-05-217-78/+37
|\
| * "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET...bar@bar.mysql.r18.ru2003-05-216-75/+10
| * Merge abarkov@build.mysql.com:/home/bk/mysql-4.1bar@bar.mysql.r18.ru2003-05-211-0/+1
| |\
| * | Two separate startup arguments for mysqld:bar@bar.mysql.r18.ru2003-05-212-3/+27
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1venu@myvenu.com2003-05-211-0/+1
|\ \ \ | | |/ | |/|
| * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@mysql.r18.ru2003-05-211-0/+1
| |\ \ | | |/ | |/|
| | * Added AsBinary alias for AsWKB function.ram@mysql.r18.ru2003-05-211-0/+1
* | | Fix merge conflict by changing warning codes to new onevenu@myvenu.com2003-05-214-13/+4
* | | client_test.c:venu@myvenu.com2003-05-211-7/+715
* | | Resolve merge conflictvenu@myvenu.com2003-05-213-15/+155
* | | Resolve merge colflictvenu@myvenu.com2003-05-21132-39339/+1235
|\ \ \ | |/ /
| * | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1vva@eagle.mysql.r18.ru2003-05-206-54/+64
| |\ \ | | |/ | |/|
| | * changed processing of LOAD DATA in mysqlbinlogvva@eagle.mysql.r18.ru2003-05-206-54/+64
| * | A separate, better error message when it's impossible to aggregate strings fo...bar@bar.mysql.r18.ru2003-05-2028-10/+69
| * | Version substitution so that tests pass on any build, independently of theguilhem@mysql.com2003-05-202-2/+5
| * | new error messagebell@sanja.is.com.ua2003-05-191-3/+3
| * | Fix for when compiling with HAVE_ISAM enabledmonty@narttu.mysql.fi2003-05-191-2/+5
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@narttu.mysql.fi2003-05-192-9/+4
| |\ \
| | * | Add empty() function for baselist.monty@narttu.mysql.fi2003-05-192-9/+4
| * | | LOCAL is an alias of NO_WRITE_TO_BINLOGguilhem@mysql.com2003-05-161-0/+1
| * | | changes to mysqladmin : use queries instead of commands (so that they have a ...guilhem@mysql.com2003-05-151-8/+8
| * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1guilhem@mysql.com2003-05-1510-46/+204
| |\ \ \ | | |/ / | |/| |
| | * | Scrum task 845. Thi is a behaviour change :guilhem@mysql.com2003-05-1510-46/+204
| * | | Fix to get thread_test to compilemonty@narttu.mysql.fi2003-05-153-3/+11
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@narttu.mysql.fi2003-05-151-2/+1
| |\ \ \
| | * | | Remove warning from automakemonty@narttu.mysql.fi2003-05-151-2/+1
| * | | | configure.in:bar@bar.mysql.r18.ru2003-05-151-1/+1
| |/ / /
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@narttu.mysql.fi2003-05-155-18/+26
| |\ \ \ | | |/ / | |/| |
| | * | Fixed new bug in ORDER BYmonty@narttu.mysql.fi2003-05-155-18/+26
| * | | Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344),guilhem@mysql.com2003-05-135-2/+70
| |/ /
| * | Give warning if MySQL doesn't honor given storage enginemonty@mashka.mysql.fi2003-05-1347-304/+462
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mashka.mysql.fi2003-05-062-1/+7
| |\ \ | | |/ | |/|
| | * Varbinary should be string as defaultmonty@mashka.mysql.fi2003-05-062-1/+7
| * | mergemonty@narttu.mysql.fi2003-05-0621-68/+170
| |\ \
| | * \ Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2003-05-0321-68/+170
| | |\ \
| | | * | INSERT ... UPDATE ... VALUES()serg@serg.mylan2003-05-0319-67/+166
| | | * | make compilation to work w/o InnoDB as well serg@serg.mylan2003-04-302-1/+4
| | * | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2003-05-031-2/+1
| | |\ \ \
| | | * | | removing unnecessary patch.Sinisa@sinisa.nasamreza.org2003-05-031-2/+1
| * | | | | Removed compiler warningsmonty@narttu.mysql.fi2003-05-0621-92/+113
| * | | | | Mergemonty@narttu.mysql.fi2003-05-0231-38592/+20
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@narttu.mysql.fi2003-04-2331-38591/+19
| | |\ \ \ \
| | | * | | | Removed some not used filesmonty@narttu.mysql.fi2003-04-2231-38591/+19
| * | | | | | Fixed bug in Item_func_compress::val_str() on MacOS X (bigendian); the lengthpem@mysql.com2003-04-301-2/+3
| | |_|_|/ / | |/| | | |
* | | | | | Fix for Windows build by adding pack.c to appropriate .dsp filesvenu@myvenu.com2003-05-203-0/+11
* | | | | | Added mysql_fetch_column functionvenu@myvenu.com2003-05-203-52/+255
* | | | | | make_win_src_distribution.sh:venu@myvenu.com2003-04-301-1/+1
* | | | | | Updated warning testvenu@myvenu.com2003-04-3021-19/+392
* | | | | | Support of warnings for all DML statements (Insert, Update and Alter)venu@myvenu.com2003-04-3014-164/+181