summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-releaseserg@mysql.com2006-05-241-7/+14
|\ | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.1-release
| * Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-releaseserg@mysql.com2006-05-241-7/+14
| |\ | | | | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
| | * Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-releaseserg@mysql.com2006-05-241-7/+14
| | |\ | | | | | | | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
| | | * don't let bugfix for bug#8303 break the bugfix for bug#8378kent@mysql.com2006-05-241-7/+14
| | | | | | | | | | | | | | | | | | | | revert the fix for bug#8303 correct the test for bug#8378
* | | | Mergekent@mysql.com2006-05-171-1/+8
|\ \ \ \
| * | | | mysql.spec.sh:kent@mysql.com2006-05-161-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed Berkeley DB configure.in: Adjusted Netware support basic.t.c: Change for Netware Makefile.am: Use thread safe libmysqlclient_r if it was built valgrind.supp: Hide report about strlen/_dl_init_paths ha_tina.cc: Temporarely disable CSV engine on Netware, as the engine depends on mmap() net_serv.cc: Include <sys/select.h> for Netware
* | | | | Rename cmakelists.txt -> CMakeLists.txtmsvensson@neptunus.(none)2006-05-121-1/+1
| | | | |
* | | | | performing a set of bk mv on each CMakeLists.txt file to try and restore the ↵reggie@big_geek.2006-05-111-0/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | mixed case filenames since this seems to be required with Cmake 2.4 beta 1. This is being pushed to a private tree and tested before being sent to the mainline.
* | | | Windows build fixes for CMakeknielsen@mysql.com2006-05-031-1/+1
| | | |
* | | | Merge mysql.com:/home/dlenev/mysql-5.0-bg11081dlenev@mysql.com2006-05-022-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/mysql-5.1-merges
| * | | | Fix a bunch of non-Linux compile failures.knielsen@mysql.com2006-05-022-2/+3
| | | | |
* | | | | Manually mergedcmiller@zippy.(none)2006-05-021-10/+28
| | | | |
* | | | | Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667cmiller@zippy.(none)2006-05-022-29/+78
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
| * | | | SECURITY FIXcmiller@zippy.(none)2006-05-012-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#17667: An attacker has the opportunity to bypass query logging. This adds a new, local-only printf format specifier to our *printf functions that allows us to print known-size buffers that must not be interpreted as NUL-terminated "strings." It uses this format-specifier to print to the log, thus fixing this problem.
| * | | | Fix incorrect merge: put '/*' comment start back.sergefp@mysql.com2006-03-301-0/+1
| | | | |
| * | | | Manual mergeevgen@sunlight.local2006-03-301-1/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Cleanup during review of new pushed codemonty@mysql.com2006-03-301-3/+3
| | | | |
| | * | | Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":konstantin@mysql.com2006-03-051-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | it breaks binary compatibility. The patch will be left intact in 5.1.
| * | | | Undo the patch for Bug#16144 "mysql_stmt_attr_get type error",konstantin@mysql.com2006-03-041-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it breaks binary compatibility. The patch will be left intact in 5.1. Warning: this changeset should be null-merged into 5.1. A separate commit in order to push into the release clone of 5.0.19.
* | | | | Some changes to make it possible to build for Windows with CMake fromknielsen@mysql.com2006-03-241-1/+2
| | | | | | | | | | | | | | | | | | | | a normal 'make dist' source .tar.gz.
* | | | | Fix Windows CMake compilation after merge of Magnuses ssl patch.knielsen@mysql.com2006-03-161-1/+1
| | | | |
* | | | | Moved cmake scripts into the proper directoriesReggie@xgeek.2006-03-151-0/+9
| | | | |
* | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-03-011-0/+35
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1
| * | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@sunlight.local2006-02-281-0/+35
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into sunlight.local:/work_local/14169-bug-5.0-mysql
| | * | | | Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was evgen@moonbone.local2006-02-281-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used In a simple queries a result of the GROUP_CONCAT() function was always of varchar type. But if length of GROUP_CONCAT() result is greater than 512 chars and temporary table is used during select then the result is converted to blob, due to policy to not to store fields longer than 512 chars in tmp table as varchar fields. In order to provide consistent behaviour, result of GROUP_CONCAT() now will always be converted to blob if it is longer than 512 chars. Item_func_group_concat::field_type() is modified accordingly.
| * | | | | Fixed new introduced bug in binlog.test with --ps-protocolmonty@mysql.com2006-02-251-2/+2
| |/ / / /
* | | | | WL#2977 and WL#2712 global and session-level variable to set the binlog ↵guilhem@mysql.com2006-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format (row/statement), and new binlog format called "mixed" (which is statement-based except if only row-based is correct, in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release): SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default; the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha. It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE TEMPORARY TABLE was not binlogged so temp table is not known on slave), or if NDB is enabled (because NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below). The added tests test the possibility or impossibility to SET, their effects, and the mixed mode, including in prepared statements and in stored procedures and functions. Caveats: a) The mixed mode will not work for stored functions: in mixed mode, a stored function will always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()). b) for the same reason, changing the thread's binlog format inside a stored function is refused with an error message. c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask Dmitri). Additionally, as the binlog format is now changeable by each user for his session, I remove the implication which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1 (not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled phantom protection). Plus fixes for compiler warnings.
* | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-02-151-3/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-02-151-0/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-02-131-3/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | * \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013msvensson@neptunus.(none)2006-02-131-3/+17
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | | * | | | | Bug#14013 mysql_stmt_store_result() bombs if a cursor is openmsvensson@neptunus.(none)2006-02-101-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add code to 'mysql_stmt_store_result' to allow it to be called on a prepared statement with open server side cursor. - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
* | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-02-151-0/+16
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| * | | | | | | Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000'msvensson@devsrv-b.mysql.com2006-02-151-0/+16
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | - Init sql_state in mysql_stmt_init
* | | | | | | Automergeserg@serg.mylan2006-02-151-1/+0
|\ \ \ \ \ \ \
| * | | | | | | dbug changes:serg@serg.mylan2006-02-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. dbug state is now local to a thread 2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL, DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF 3. macros are do{}while(0) wrapped 4. incremental modifications to the dbug state (e.g. "+d,info:-t") 5. dbug code cleanup, style fixes 6. _db_on_ and DEBUGGER_ON/OFF removed 7. rest of MySQL code fixed because of 3 (missing ;) and 6 8. dbug manual updated 9. server variable @@debug (global and local) to control dbug from SQL! a. -#T to print timestamps in the log
* | | | | | | | This patch removes the remaining TYPE= code from MySQL. It cleans up a ↵brian@zim.tangent.org2006-02-124-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.
* | | | | | | | Merge lmy004.:/work/mysql-5.0-cleanandrey@lmy004.2006-02-111-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | into lmy004.:/work/mysql-5.1-new-clean
| * | | | | | | fix test of bug 12744 on OSXandrey@lmy004.2006-02-101-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge mysql.com:/home/kostja/mysql/tmp_merge1konstantin@mysql.com2006-02-091-17/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-5.1-merge
| * | | | | | Post-merge fixes.konstantin@mysql.com2006-02-031-17/+0
| | | | | | |
* | | | | | | Merge mysql.com:/home/kostja/mysql/tmp_mergekonstantin@mysql.com2006-02-081-0/+51
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | into mysql.com:/home/kostja/mysql/mysql-5.1-merge
| * | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2006-02-021-1/+51
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| | * | | | fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection ↵andrey@lmy004.2006-02-011-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | reset)
| * | | | | Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719msvensson@neptunus.(none)2006-01-301-2/+77
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
* | \ \ \ \ \ Merge mysql.com:/home/kostja/mysql/tmp_mergekonstantin@mysql.com2006-02-021-2/+82
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | into mysql.com:/home/kostja/mysql/mysql-5.1-merge
| * | | | | Merge mysql.com:/opt/local/work/mysql-4.1-15613konstantin@mysql.com2006-01-191-0/+64
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| | * | | | A fix and a test case for Bug#15613 "libmysqlclient API functionkonstantin@mysql.com2006-01-181-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | mysql_stmt_prepare returns wrong field length"
| * | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2006-01-181-0/+19
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | | into mysql.com:/opt/local/work/mysql-5.0-root
| | * | | A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":konstantin@mysql.com2006-01-171-0/+20
| | | |/ | | |/| | | | | | | | | use the right type in mysql_stmt_attr_get
View Lorry Controller Status