summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Drop a number of OS2 specific files. brian@zim.(none)2006-04-103-845/+1
|
* Implement --warning-mode in SETUP.sh. The value of thekonstantin@mysql.com2006-04-071-1/+1
| | | | | | | argument can be either "pedantic" or "old" (actually, or anything else). In case of "pedantic" mode, use -ansi -pedantic compilation flags. Fix the build to compile in pedantic mode. (Version 3 of the patch, with after-review fixes)
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmsvensson@shellback.(none)2006-04-061-0/+1
|\ | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1
| * Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-04-041-0/+1
| |\ | | | | | | | | | into shellback.(none):/home/msvensson/mysql/bug17368/my51-bug17368
| | * Bug#17368 General log and slow query log don't workmsvensson@shellback.(none)2006-04-041-0/+1
| | | | | | | | | | | | - Port ha_tina.cc to run on windows
| * | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-04-041-0/+15
| |\ \ | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1
* | \ \ Manual merge.knielsen@mysql.com2006-03-282-0/+8
|\ \ \ \
| * | | | Define USE_TLS when compiling libmysql.dll, to avoid crashing whenknielsen@mysql.com2006-03-222-0/+8
| | |_|/ | |/| | | | | | | | | | loaded at runtime.
* | | | Merge zim.(none):/home/ian/workspace/mysql-5.0ian@zim.(none)2006-03-271-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into zim.(none):/home/ian/workspace/mysql-5.1-new Updated bug message in disabled file -Brian
| * \ \ \ Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2006-03-271-0/+2
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * | | Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"monty@mysql.com2006-03-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared library
* | | | | Merge 192.168.0.100:mysql/mysql-5.0msvensson@neptunus.(none)2006-03-241-0/+15
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| * | | Fix type "enfif" -> "endif"msvensson@shellback.(none)2006-03-231-1/+1
| | | |
| * | | Mergekent@mysql.com2006-03-231-0/+15
| |\ \ \
| | * | | config-win.h:kent@mysql.com2006-03-231-0/+15
| | | | | | | | | | | | | | | | | | | | If CYBOZU defined, set character sets etc
| | * | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2006-03-231-4/+13
| | |\ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b15376
* | | \ \ \ after merge fixbar@mysql.com2006-03-241-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | m_ctype.h:bar@mysql.com2006-03-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug##15376 After merge fix: removing redundant macros.
* | | | | | Merge mysql.com:/usr/home/bar/mysql-5.0bar@mysql.com2006-03-231-4/+13
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new
| * | | | | m_ctype.h:bar@mysql.com2006-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing duplicate old definition. After merge fix for bug#15375
| * | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b15376bar@mysql.com2006-03-231-0/+14
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0
| | * | | | Bug#15375 Unassigned multibyte codes are brokenbar@mysql.com2005-12-121-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into parts when converting to Unicode. m_ctype.h: Reorganizing mb_wc return codes to be able to return "an unassigned N-byte-long character". sql_string.cc: Adding code to detect and properly handle unassigned characters (i.e. the those character which are correctly formed according to the character specifications, but don't have Unicode mapping). Many files: Fixing conversion function to return new codes. ctype_ujis.test, ctype_gbk.test, ctype_big5.test: Adding a test case. ctype_ujis.result, ctype_gbk.result, ctype_big5.result: Fixing results accordingly.
* | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newbar@mysql.com2006-03-231-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new
| * \ \ \ \ \ Merge mysql.com:/usr/home/bar/mysql-5.0bar@mysql.com2006-03-231-0/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new
| | * | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b17374bar@mysql.com2006-03-231-0/+5
| | |\ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | | into mysql.com:/usr/home/bar/mysql-5.0
| | | * | | Bug#17374: select ... like 'A%' operator fails to find value on columuns ↵bar@mysql.com2006-03-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with key Fixed that LIKE worked case insensitively for latin2_czech_cs, which was wrong for a case sensitive collation.
| | * | | | Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195msvensson@shellback.(none)2006-03-161-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0
| | * \ \ \ \ Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2006-03-101-4/+24
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug14980
* | | \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-03-221-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
| * | | | | | | continued:tomas@poseidon.ndb.mysql.com2006-03-221-0/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour
* | | | | | | Bug#11835 CREATE FUNCTION crashes servermsvensson@neptunus.(none)2006-03-211-9/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update for 5.1 - Add "have_dlopen" - Remove requirement to load udf's only in "opt_plugin_dir"
* | | | | | Merge shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195msvensson@shellback.(none)2006-03-161-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1
| * \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195msvensson@shellback.(none)2006-03-161-2/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195
| | * | | | | Bug#18195 MySQL on Windows not built with YaSSL correctlymsvensson@shellback.(none)2006-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add HAVE_OPENSSL and HAVE_YASSL to config-win.h
* | | | | | | Merge mysql.com:/home/mydev/mysql-5.1ingo@mysql.com2006-03-101-4/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.1-bug14980
| * \ \ \ \ \ \ Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/mysql-5.1joerg@mysql.com2006-03-101-4/+24
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | Include the system header file "pthread.h" even in a non-threaded build.joerg@mysql.com2006-03-101-4/+24
| | |/ / / / | | | | | | | | | | | | | | | | | | Fixes bug#15861
* | | | | | Merge mysql.com:/home/mydev/mysql-5.0-bug14980ingo@mysql.com2006-03-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | into mysql.com:/home/mydev/mysql-5.1-bug14980
| * | | | Merge mysql.com:/home/mydev/mysql-4.1-bug14980ingo@mysql.com2006-03-101-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / into mysql.com:/home/mydev/mysql-5.0-bug14980
| | * | Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEXingo@mysql.com2006-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For "count(*) while index_column = value" an index read is done. It consists of an index scan and retrieval of each key. For efficiency reasons the index scan stores the key in the special buffer 'lastkey2' once only. At the first iteration it notes this fact with the flag HA_STATE_RNEXT_SAME in 'info->update'. For efficiency reasons, the key retrieval for blobs does not allocate a new buffer, but uses 'lastkey2'... Now I clear the HA_STATE_RNEXT_SAME flag whenever the buffer has been polluted. In this case, the index scan copies the key value again (and sets the flag again).
* | | | Mergekent@mysql.com2006-02-281-0/+1
|\ \ \ \
| * | | | config-win.h:kent@mysql.com2006-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable row based replication for Windows build replication.m4: Made help text more clear, default is with row based replication enabled
* | | | | Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525dlenev@mysql.com2006-02-271-0/+9
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.1-merges2
| * | | | Bug#17716 Slave crash in net_clear on qnxmsvensson@neptunus.(none)2006-02-271-0/+9
| | | | | | | | | | | | | | | | | | | | - Set FD_SETSIZE before including "sys/select.h"
| * | | | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-241-3/+6
| | | | | | | | | | | | | | | | | | | | (Needed for "list of pushes" web page and autopush)
| * | | | Merge ↵msvensson@neptunus.(none)2006-02-211-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace into neptunus.(none):/home/msvensson/mysql/mysql-5.0
* | | | | | This patch cleans up two tests which were a bit fragile from other failing ↵brian@zim.(none)2006-02-244-165/+1
| | | | | | | | | | | | | | | | | | | | | | | | tests. It also removes some variables associated with removed RAID support.
* | | | | | Merge ↵msvensson@neptunus.(none)2006-02-211-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| * | | | | Merge ↵msvensson@neptunus.(none)2006-02-171-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace into neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
| | * | | | #define popen(A,B) _popen((A),(B))msvensson@neptunus.(none)2006-02-161-1/+1
| | | | | |