summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Collapse)AuthorAgeFilesLines
* Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0anozdrin/alik@quad.opbmk2008-03-181-3/+7
|\ | | | | | | into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
| * Bug#35103 mysql_client_test::test_bug29948 causes sporadic failuresdavi@mysql.com/endora.local2008-03-141-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the COM_STMT_SEND_LONG_DATA was sending a response packet if the prepared statement wasn't found in the server (due to reconnection). The commands COM_STMT_SEND_LONG_DATA and COM_STMT_CLOSE should not send any packets, even error packets should not be sent since they are not expected by the client API. The solution is to clear generated during the execution of the aforementioned commands and to skip resend of prepared statement commands. Another fix is that if the connection breaks during the send of prepared statement command, the command is not sent again since the prepared statement is no longer in the server.
* | Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.holyfoot/hf@mysql.com/hfmain.(none)2008-02-271-6/+21
|/ | | | | | | There was no way to return an error from the client library if no MYSQL connections was established. So here i added variables to store that king of errors and made functions like mysql_error(NULL) to return these.
* Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@eagle.(none)2007-12-131-1/+8
|\ | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
| * Merge mysql.com:/misc/mysql/mysql-5.0-opttnurnberg@white.intern.koehntopp.de2007-11-171-1/+8
| |\ | | | | | | | | | into mysql.com:/misc/mysql/32180/50-32180
| | * Bug #32180: DATE_ADD treats datetime numeric argument as DATE instead of ↵tnurnberg@mysql.com/white.intern.koehntopp.de2007-11-161-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | DATETIME This is a regression from 2007-05-18 when code to zero out the returned struct was added to number_to_datetime(); zero for time_type corresponds to MYSQL_TIMESTAMP_DATE. We now explicitly set the type we return (MYSQL_TIMESTAMP_DATETIME).
* | | Merge pilot.mysql.com:/data/msvensson/mysql/bug32429/my50-bug32429msvensson@pilot.mysql.com2007-11-261-0/+5
|\ \ \ | |/ / |/| | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
| * | Bug#32429 ssl_cipher setting in my.cnf not read by libmysqlclientmsvensson@pilot.mysql.com2007-11-161-0/+5
| |/
* | Bug#31800: Date comparison fails with timezone and slashes for greater than ↵tnurnberg@mysql.com/white.intern.koehntopp.de2007-11-101-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | comparison BETWEEN was more lenient with regard to what it accepted as a DATE/DATETIME in comparisons than greater-than and less-than were. ChangeSet makes < > comparisons similarly robust with regard to trailing garbage (" GMT-1") and "missing" leading zeros. Now all three comparators behave similarly in that they throw a warning for "junk" at the end of the data, but then proceed anyway if possible. Before < > fell back on a string- (rather than date-) comparison when a warning-condition was raised in the string-to-date conversion. Now the fallback only happens on actual errors, while warning- conditions still result in a warning being to delivered to the client.
* | Bug#30951: makedate returns different results depending on version of mysqltnurnberg@sin.intern.azundris.com2007-10-121-5/+0
|/ | | | | | makedate() will fold years below 100 into the 1970-2069 range. CS removes code that also wrongly folded years between 100 and 200 into that range, which should be left unchanged. Backport from 5.1.
* Merge mysql.com:/home/hf/work/29494/my41-29494holyfoot/hf@hfmain.(none)2007-07-221-7/+7
|\ | | | | | | into mysql.com:/home/hf/work/29494/my50-29494
| * Bug #29494 Field packet with NULL fields crashes libmysqlclient.holyfoot/hf@mysql.com/hfmain.(none)2007-07-201-7/+7
| | | | | | | | | | | | | | unpack_fields() didn't expect NULL_LENGHT in the field's descriptions. In this case we get NULL in the resulting string so cannot use strdup_root to make a copy of it. strdup_root changed with strmake_root as it's NULL-safe
| * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-261-4/+1
| |\ | | | | | | | | | into mysql.com:/home/ram/work/b25301/b25301.4.1
| * \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-051-1/+1
| |\ \ | | | | | | | | | | | | into mysql.com:/home/ram/work/b23616/b23616.4.1
* | \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@hfmain.(none)2007-06-291-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/29247/my50-29247
| * | | | Bug #29247 Double free in libmysqlclient_r when mysql restarted.holyfoot/hf@mysql.com/hfmain.(none)2007-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one sets MYSQL_READ_DEFAULTS_FILE and MYSQL_READ_DEFAULT_GROUP options after mysql_real_connect() called with that MYSQL instance, these options will affect next mysql_reconnect then. As we use a copy of the original MYSQL object inside mysql_reconnect, and mysql_real_connect frees options.my_cnf_file and _group strings, we will free these twice when we execute mysql_reconnect with the same MYSQL for the second time. I don't think we should ever read defaults files handling mysql_reconnect. So i just set them to 0 for the temporary MYSQL object there/
* | | | | Bug#24924: shared-memory-base-name that is too long causes buffer overflowtnurnberg@sin.intern.azundris.com2007-06-211-1/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | long shared-memory-base-names could overflow a static internal buffer and thus crash mysqld and various clients. change both to dynamic buffers, show everything but overflowing those buffers still works. The test case for this would pretty much amount to mysqld --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --shared-memory=1 & mysqladmin --no-defaults --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX shutdown Unfortunately, we can't just use an .opt file for the server. The .opt file is used at start-up, before any include in the actual test can tell mysqltest to skip this one on non-Windows. As a result, such a test would break on unices. Fixing mysql-test-run.pl to export full path for master and slave would enable us to start a server from within the test which is ugly and, what's more, doesn't work as the server blocks (mysqltest offers no fire-and-forget fork-and-exec), and mysqladmin never gets run. Making the test rpl_windows_shm or some such so we can is beyond ugly. As is introducing another file-name based special case (run "win*.test" only when on Windows). As is (yuck) coding half the test into mtr (as in, having it hand out a customized environment conductive to the shm- thing on Win only). Situation is exacerbated by the fact that .sh is not necessary run as expected on Win. In short, it's just not worth it. No test-case until we have a new-and-improved test framework.
* | | | Bug #24731 Shared memory connections do not work with MySql ran as service ↵"Reggie"/Reggie@xp.2007-06-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | on Vista The events were not being opened in the global namespace.
* | | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * | | | Bug#26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The "mysql client in mysqld"(which is used by replication and federated) should use alarms instead of setting socket timeout value if the rest of the server uses alarm. By always calling 'my_net_set_write_timeout' or 'my_net_set_read_timeout' when changing the timeout value(s), the selection whether to use alarms or timeouts will be handled by ifdef's in those two functions. - Move declaration of 'vio_timeout' into "vio_priv.h"
* | | | | my_time.c:tsmith@quadxeon.mysql.com2007-05-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in number_to_datetime(), zero out the MYSQL_TIME structure before setting values, to ensure that all fields are initialized; in particular, ensure that ->neg is set to zero (fixes valgrind warning "Conditional jump ... depends on uninitialised value" in make_date_time)
* | | | | Backport of TIME->MYSQL_TIME / Y2K fixsetmsvensson@pilot.blaudden2007-05-161-1/+33
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made year 2000 handling more uniform Removed year 2000 handling out from calc_days() The above removes some bugs in date/datetimes with year between 0 and 200 Now we get a note when we insert a datetime value into a date column For default values to CREATE, don't give errors for warning level NOTE Fixed some compiler failures Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support) Removed duplicate typedef TIME and replaced it with MYSQL_TIME Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE" Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value" Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"
* | | | Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121msvensson@pilot.blaudden2007-03-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * | | | Bug#24121 Incorrect test for SSL_VERIFY_SERVER_CERTmsvensson@pilot.blaudden2007-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Interpret the pointer passed to 'mysql_options' for MYSQL_OPT_SSL_VERIFY_SERVER_CERT as a my_bool - In 5.1 the mysql_options signature will be chanegd to take a 'void*' in order to further emphasize the need for a pointer to correct type
* | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-261-5/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into mysql.com:/home/ram/work/b25301/b25301.5.0
| * | | | Merge mysql.com:/home/ram/work/b25301/b25301.4.1ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-02-081-5/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | into mysql.com:/home/ram/work/b25301/b25301.5.0
| | * | | Fix for bug #25301: Non-zero dates with year 0000 are invalidramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-02-081-4/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 0000 year is valid. The ISO standard for "Representation of dates and times" says: "Calendar years are numbered in ascending order according to the Gregorian calendar by values in the range [0000] to [9999]." Reverted fix for 21789: DATETIME with 0000-00-00 11:22:33 should be invalid, but is accepted as it's not a bug. Fix for 19370: DateTime datatype in MySQL has two bugs in it will be reverted during 4.1 -> 5.0 merging as it was pushed to the 5.0 tree.
* | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b23616/b23616.5.0
| * \ \ \ Merge mysql.com:/home/ram/work/b23616/b23616.4.1ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-021-1/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | into mysql.com:/home/ram/work/b23616/b23616.5.0
| | * | | Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2006-12-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Consider double values as legal date{time} function's arguments (i.e. allow dates in internal format YYYYMMDDHHMMSS.XXXXXX).
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-212-30/+31
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | into mysql.com:/home/my/mysql-5.0
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-222-30/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-152-30/+31
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | | * | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-152-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed not used variables and functions - Added #ifdef around code that is not used - Renamed variables and functions to avoid conflicts - Removed some not used arguments Fixed some class/struct warnings in ndb Added define IS_LONGDATA() to simplify code in libmysql.c I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
* | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943msvensson@pilot.mysql.com2007-01-291-1/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | into pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
| * | | | Bug#22943 syscall pruning in libmysqlmsvensson@pilot.mysql.com2007-01-291-1/+7
| | |_|/ | |/| | | | | | | | | | - Set the timeout values only where needed
| * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-11-281-0/+2
| |\ \ \ | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
| * \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-11-241-9/+115
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
| * \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-11-221-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
* | | | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected spelling in copyright text Makefile.am: Don't update the files from BitKeeper Many files: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header Many files: Added GPL copyright text Removed files: Docs/Support/colspec-fix.pl Docs/Support/docbook-fixup.pl Docs/Support/docbook-prefix.pl Docs/Support/docbook-split Docs/Support/make-docbook Docs/Support/make-makefile Docs/Support/test-make-manual Docs/Support/test-make-manual-de Docs/Support/xwf
* | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-235-10/+5
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Changed header to GPL version 2 only
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-12-042-10/+10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * | | | | Fixed portability issue in my_thr_init.c (was added in my last push)monty@mysql.com/narttu.mysql.fi2006-11-302-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warnings (detected by VC++): - Removed not used variables - Added casts - Fixed wrong assignments to bool - Fixed wrong calls with bool arguments - Added missing argument to store(longlong), which caused wrong store method to be called.
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-11-282-14/+80
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2006-11-271-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.0-merge
| | * | | | | Fix my_system_gmt_sec function declaration to be same as definitionmsvensson@neptunus.(none)2006-11-231-1/+1
| | | | | | |
| * | | | | | Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-11-272-12/+76
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
| | * | | | | | Added some missing DBUG_RETURNmonty@mysql.com/nosik.monty.fi2006-11-231-6/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that --valgrind works again with mysql-test-run.sh Extended error messages when loosing connection during mysql_real_connect()
| | * | | | | | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-202-6/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #)
| * | | | | | Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-11-171-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0-0mrg