monty@mysql.com
86b2be8d35
After merge fixes
...
Remove compiler warnings
Fix some broken tests
Workaround for syncronization bug in NDB (Bug #16445 )
2006-05-04 06:28:24 +03:00
monty@mysql.com
8f6ed291a7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/my/mysql-5.1
2006-05-04 01:58:21 +03:00
acurtis@xiphis.org
3954c72207
Merge acurtis@bk-internal:/home/bk/mysql-5.1-new
...
into xiphis.org:/home/antony/work2/wl3201-final
2006-05-03 15:58:12 -07:00
monty@mysql.com
9756d7f853
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/my/mysql-5.1
2006-05-03 16:03:19 +03:00
monty@mysql.com
343644dd5d
Added support for key_block_size for key and table level (WL#602)
...
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
2006-05-03 15:59:17 +03:00
svoj@april.(none)
365e38b05c
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
2006-05-03 16:37:42 +05:00
cmiller@zippy.(none)
ba0752e125
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
2006-05-02 15:09:35 -04:00
cmiller@zippy.(none)
4d15fc5ee0
Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
2006-05-02 13:55:03 -04:00
elliot@mysql.com
c0b5b3cd40
Fix spelling in comments as requested by Osku
...
This will make charset code easier to understand
2006-05-02 09:13:58 -04:00
acurtis@xiphis.org
f1d4921139
WL#3201 additional post-review fixes
2006-05-02 04:11:00 -07:00
holyfoot@mysql.com
128593f0c2
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.18518
2006-05-02 14:36:05 +05:00
acurtis@xiphis.org
09c7374d69
Merge xiphis.org:/home/antony/work2/mysql-5.1
...
into xiphis.org:/home/antony/work2/wl3201-post-review.2
2006-05-01 22:45:31 -07:00
cmiller@zippy.(none)
1205ae8276
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
2006-05-01 22:50:36 -04:00
cmiller@zippy.(none)
85ffd9640e
SECURITY FIX
...
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.
2006-05-01 22:10:50 -04:00
jimw@mysql.com
052b126853
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-01 11:38:15 -07:00
holyfoot@deer.(none)
9b832153f9
Fix for Win build
2006-05-01 22:16:08 +05:00
jimw@mysql.com
f21c110d13
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 13:27:38 -07:00
kent@mysql.com
5e717959d0
config-win.h:
...
Fix strange "double" define for popen.
Avoid warnings about sprintf() etc. being unsafe.
Corrected typo "#endfif"
2006-04-29 15:58:02 +02:00
holyfoot@mysql.com
06b57c4871
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.18518
2006-04-27 15:07:36 +05:00
msvensson@neptunus.(none)
31db4898c3
Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-26 22:24:25 +02:00
holyfoot@deer.(none)
46e79f6708
bug #18518 (embedded server crashes starting)
2006-04-26 13:25:09 +05:00
acurtis@xiphis.org
53d4594cfe
Merge xiphis.org:/home/antony/work2/wl3201.3
...
into xiphis.org:/home/antony/work2/wl3201.merge
2006-04-24 13:36:15 -07:00
msvensson@neptunus.(none)
29ace143a1
Backport fix for mysql client not using SSl library directly
...
- Add function mysql_get_ssl_cipher
- Use function mysql_get_ssl_cipher from mysql
2006-04-22 00:48:13 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
09e95da616
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-19 21:22:35 -04:00
svoj@april.(none)
06ce215f10
BUG#18160 - Memory-/HEAP Table endless growing indexes
...
Updating data in HEAP table with BTREE index results in wrong index_length
counter value, which keeps growing after each update.
When inserting new record into tree counter is incremented by:
sizeof(TREE_ELEMENT) + key_size + tree->size_of_element
But when deleting element from tree it doesn't decrement counter by key_size:
sizeof(TREE_ELEMENT) + tree->size_of_element
This fix makes accurate allocated memory counter for tree. That is
decrease counter by key_size when deleting tree element.
2006-04-19 15:13:50 +05:00
bar@mysql.com
cedafc30e8
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
2006-04-19 09:50:17 +05:00
msvensson@neptunus.(none)
a51668c74c
Bug#17208 SSL: client does not verify server certificate
...
- Add new function 'ssl_verify_server_cert' which is used if we are
connecting to the server with SSL. It will compare the hostname in
the server's cert against the hostname that we used when connecting
to the server. Will reject the connection if hostname does not match.
- Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
which will turn on checking of servers cert.
- Add new argument "ssl-verify-server-cert" to all mysql* clients which
will activate the above option.
- Generate a new server cert with 1024 bits that has "localhost" as the server name.
2006-04-18 17:58:27 +02:00
brian@zim.(none)
6f986a344b
UNIXWARE removal
2006-04-17 15:56:59 -07:00
brian@zim.(none)
93f965d1fe
Found one piece I missed when I removed HAVE_mit (just broke on windows and I don't have windows locally). This I believe should fix it.
2006-04-16 22:10:56 -07:00
brian@zim.(none)
3831083b15
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-04-16 08:03:15 -07:00
petr@mysql.com
d99cbca22f
fix broken compile
2006-04-16 14:38:52 +04:00
brian@zim.(none)
f6f03576c6
This completes the work done in 5.0 to remove mit_pthread support (most was pulled in 5.0, but there were some pieces left in the tree)
2006-04-16 01:50:25 -07:00
brian@zim.(none)
5d1d27c016
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
brian@zim.(none)
ba2502b9c3
Another long patch to remove the rest of the OS2 support.
2006-04-15 08:49:00 -07:00
acurtis@xiphis.org
4e11a4d941
WL#3201
...
" Configure support for server plugins "
2006-04-13 13:49:29 -07:00
mats@mysql.com
0bd7349557
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/merge-mysql-5.1-wl3206
2006-04-13 13:25:58 +02:00
msvensson@neptunus.(none)
e5712d8413
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
2006-04-12 12:52:34 +02:00
mats@mysql.com
1ebd03fcfc
Added missing prototypes to mysys/my_bitmap.h
2006-04-11 20:31:02 +02:00
msvensson@shellback.
fc3485c17e
Bug#15936 "round" differs on Windows to Unix
...
- remove the windows specific implementation of 'rint' and use the default from my_global.h
2006-04-11 20:18:54 +02:00
msvensson@shellback.
661d572ae1
Remove unused defined USES_TYPES
2006-04-11 20:12:57 +02:00
bar@mysql.com
e8e0d5c5fe
bug#17870 Table names conflict with Windows device names
...
It was impossible to create some table names on Windows
(e.g. LPT1, AUX, COM1, etc).
Fixed to pad dangerous names with thee "at" signs
(e.g. LPT1@@@, AUX@@@, COM1@@@, and so on).
2006-04-11 18:16:14 +05:00
msvensson@neptunus.(none)
8fe764fbb2
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-11 09:11:36 +02:00
brian@zim.(none)
eaf850ef5b
Drop a number of OS2 specific files.
2006-04-10 17:48:19 -07:00
msvensson@shellback.(none)
70404e2a75
Fix spelling error
2006-04-07 12:46:50 +02:00
msvensson@neptunus.(none)
bed57fcf7e
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-07 11:36:28 +02:00
msvensson@neptunus.(none)
98904a8caa
Add new function mysql_get_ssl_cipher to libmysl and use it from client to avoid dependency on SSL libs from mysql client.
2006-04-07 11:26:21 +02:00
konstantin@mysql.com
8cb1245c1e
Implement --warning-mode in SETUP.sh. The value of the
...
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)
2006-04-07 02:25:59 +04:00
msvensson@shellback.(none)
e1348410d7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-04-06 11:38:50 +02:00
msvensson@shellback.(none)
abc72552b5
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/bug17368/my51-bug17368
2006-04-04 10:00:27 +02:00
msvensson@shellback.(none)
67bcb953aa
Bug#17368 General log and slow query log don't work
...
- Port ha_tina.cc to run on windows
2006-04-04 09:59:19 +02:00
msvensson@shellback.(none)
d387211106
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-04-04 09:51:06 +02:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
0a02cbb5f6
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-01 16:31:53 -05:00
knielsen@mysql.com
cc57e4e01b
Manual merge.
2006-03-28 10:07:03 +02:00
ian@zim.(none)
9caff206c2
Merge zim.(none):/home/ian/workspace/mysql-5.0
...
into zim.(none):/home/ian/workspace/mysql-5.1-new
Updated bug message in disabled file -Brian
2006-03-27 19:48:44 -08:00
monty@mysql.com
4ab6bc4b43
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-03-27 12:07:59 +03:00
monty@mysql.com
3dcbbb7c4d
Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"
...
This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library
2006-03-27 12:02:23 +03:00
msvensson@neptunus.(none)
ab1f95df3e
Merge 192.168.0.100:mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 12:33:11 +01:00
bar@mysql.com
8110748117
after merge fix
2006-03-24 12:42:28 +04:00
msvensson@shellback.(none)
3495ba51f7
Fix type "enfif" -> "endif"
2006-03-23 20:59:23 +01:00
kent@mysql.com
9d387d1c6e
Merge
2006-03-23 17:41:53 +01:00
kent@mysql.com
3c93e6efa5
config-win.h:
...
If CYBOZU defined, set character sets etc
2006-03-23 17:25:49 +01:00
bar@mysql.com
8620ac4d64
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15376
2006-03-23 14:29:43 +04:00
bar@mysql.com
796647f711
m_ctype.h:
...
Bug##15376
After merge fix: removing redundant macros.
2006-03-23 14:17:48 +04:00
bar@mysql.com
b2b020b318
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 14:14:32 +04:00
bar@mysql.com
36e92839fc
m_ctype.h:
...
Removing duplicate old definition.
After merge fix for bug#15375
2006-03-23 13:05:13 +04:00
bar@mysql.com
1008146d86
Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 12:41:28 +04:00
bar@mysql.com
b372b28e1f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 10:25:04 +04:00
bar@mysql.com
6ab496ac06
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 10:19:55 +04:00
bar@mysql.com
82de23010b
Merge mysql.com:/usr/home/bar/mysql-4.1.b17374
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 10:17:31 +04:00
tomas@poseidon.ndb.mysql.com
615699a82e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-22 16:06:34 +01:00
tomas@poseidon.ndb.mysql.com
e0b655d003
continued:
...
ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour
2006-03-22 15:56:53 +01:00
knielsen@mysql.com
9c84881310
Define USE_TLS when compiling libmysql.dll, to avoid crashing when
...
loaded at runtime.
2006-03-22 09:55:26 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
3dc4635c70
Merge c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-03-21 10:44:59 -05:00
msvensson@neptunus.(none)
dc749e9ad7
Bug#11835 CREATE FUNCTION crashes server
...
- Update for 5.1
- Add "have_dlopen"
- Remove requirement to load udf's only in "opt_plugin_dir"
2006-03-21 10:54:26 +01:00
bar@mysql.com
da8a68b4ca
Bug#17374: select ... like 'A%' operator fails to find value on columuns with key
...
Fixed that LIKE worked case insensitively for latin2_czech_cs,
which was wrong for a case sensitive collation.
2006-03-20 16:28:25 +04:00
msvensson@shellback.(none)
89c6b28147
Merge shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 09:39:09 +01:00
msvensson@shellback.(none)
2fe3e20597
Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-16 09:37:47 +01:00
msvensson@shellback.(none)
f5d4028352
Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195
...
into shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195
2006-03-16 09:34:47 +01:00
msvensson@shellback.(none)
42a3ff3f99
Bug#18195 MySQL on Windows not built with YaSSL correctly
...
- Add HAVE_OPENSSL and HAVE_YASSL to config-win.h
2006-03-14 14:51:48 +01:00
ingo@mysql.com
972c2a4abc
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug14980
2006-03-10 22:28:50 +01:00
ingo@mysql.com
3052249ec2
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug14980
2006-03-10 22:24:13 +01:00
joerg@mysql.com
acfb14413e
Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/mysql-5.1
2006-03-10 21:05:10 +01:00
ingo@mysql.com
5fc79af387
Merge mysql.com:/home/mydev/mysql-5.0-bug14980
...
into mysql.com:/home/mydev/mysql-5.1-bug14980
2006-03-10 17:52:28 +01:00
joerg@mysql.com
cc8faec9b6
Include the system header file "pthread.h" even in a non-threaded build.
...
Fixes bug#15861
2006-03-10 17:13:54 +01:00
msvensson@neptunus.(none)
aa3abd1550
Cleanup SSL implementation
...
Remove duplicate code
Merge common functions
Enforce MySQL coding standard
2006-03-10 16:41:14 +01:00
ingo@mysql.com
1173185891
Merge mysql.com:/home/mydev/mysql-4.1-bug14980
...
into mysql.com:/home/mydev/mysql-5.0-bug14980
2006-03-10 15:06:04 +01:00
ingo@mysql.com
d0c6eb885d
Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
...
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).
2006-03-10 15:03:04 +01:00
kent@mysql.com
5d722a8491
Merge
2006-02-28 23:29:58 +01:00
dlenev@mysql.com
8dbdf5237e
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:00:07 +03:00
msvensson@neptunus.(none)
44a2855382
Bug#17716 Slave crash in net_clear on qnx
...
- Set FD_SETSIZE before including "sys/select.h"
2006-02-27 10:08:35 +01:00
kent@mysql.com
9571e81f04
config-win.h:
...
Enable row based replication for Windows build
replication.m4:
Made help text more clear, default is with row based replication enabled
2006-02-25 21:27:49 +01:00
brian@zim.(none)
cb07d52a7e
This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.
2006-02-24 13:20:51 -08:00
monty@mysql.com
82b77cdd90
Fixes to embedded server to be able to run tests with it
...
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
msvensson@neptunus.(none)
8e760bc6cc
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 10:37:10 +01:00
msvensson@neptunus.(none)
40fe710394
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se
dd17f48630
Merge c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-bugs
...
into c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-02-20 16:41:46 -05:00
msvensson@neptunus.(none)
01cd7a05c7
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
2006-02-17 12:16:36 +01:00
holyfoot@mysql.com
be02944df6
Merging 5.0->5.1
2006-02-17 11:26:03 +04:00
holyfoot@deer.(none)
053d90a234
WL#2645 (CHECK TABLE FOR UPGRADE)
...
necessary implementation in the server
mysql_upgrade script added
2006-02-17 10:52:32 +04:00
msvensson@neptunus.(none)
cb9b610586
#define popen(A,B) _popen((A),(B))
2006-02-16 23:05:15 +01:00
serg@serg.mylan
48b8e842ca
Automerge
2006-02-15 00:01:46 +01:00
serg@serg.mylan
94d225aa6f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-14 22:57:12 +01:00
serg@serg.mylan
a511d770ee
my_bool is internal type, so should be SHOW_MY_BOOL
2006-02-14 22:51:16 +01:00
serg@serg.mylan
63cfd11859
dbug changes:
...
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
2006-02-14 22:36:11 +01:00
svoj@april.(none)
7e8b145b94
BUG#17117: header fille "plugin.h" does not have a namespace prefix
...
plugin.h has been moved into include/mysql/plugin.h
2006-02-14 13:51:25 +04:00
aivanov@mysql.com
f8f8af970e
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-02-10 01:15:45 +03:00
aivanov@mysql.com
e22d2f1150
Fixed BUG#9680: Wrong error from cascading update
...
Applied 9680.patch (by Osku Salerma)
2006-02-09 20:43:10 +03:00
konstantin@mysql.com
5ed755d0d8
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 23:53:45 +03:00
mikron@c-fa09e253.1238-1-64736c10.cust.bredbandsbolaget.se
5091f3a8a5
WL 2826: Step 11
...
Lots of new code for table log
2006-02-07 10:45:07 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
d955abd292
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-02-05 11:06:29 +02:00
mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se
981454b313
WL 2826: Eigth step
...
Inserted monty patch to allow for adding and dropping
DBUG keywords per thread
2006-02-03 18:05:31 +01:00
mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se
edb8811f03
WL 2826: Seventh step, more fixes for error injects
...
Removed session variables for error injects
started using DBUG macros for error injects
2006-02-03 18:05:30 +01:00
konstantin@mysql.com
98091b152a
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-02-02 18:17:18 +03:00
jani@ua141d10.elisa.omakaista.fi
2dcc483e6c
Several Netware specific fixes.
2006-02-02 16:22:31 +02:00
konstantin@mysql.com
92b41ba92a
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 16:57:34 +03:00
bar@mysql.com
d7c773834b
WL#1386 - CTYPE table for unicode character sets
...
A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
Adding new function
Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
Adding new member into MY_CHARSET_HANDLER
Makefile.am:
Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
new files:
ctype data for unicode,
and the tool to generate it from
a Unicode Character Database file.
2006-02-02 10:07:47 +04:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a69827f152
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 09:29:59 -05:00
serg@serg.mylan
cbd98c01cf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-26 09:51:24 +01:00
brian@zim.tangent.org
570bffe8c7
Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
...
my_stat() gettinng the correct parameter list may be next :)
2006-01-25 19:54:42 -08:00
andrey@lmy004.
91ff153dcb
Merge
2006-01-23 13:07:31 +01:00
holyfoot@mysql.com
09359dce59
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
2006-01-23 11:59:31 +04:00
knielsen@mysql.com
113b1e4e6c
Merge mysql.com:/usr/local/mysql/ab/mirrors/pullers/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmp5.1
2006-01-19 21:50:57 +01:00
serg@serg.mylan
2dee3a7216
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-19 19:33:51 +01:00
holyfoot@mysql.com
53a379d041
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
2006-01-19 18:05:57 +04:00
cps@outpost.site
ce2eb6d8cb
WL1019: complete patch. Reapplied patch to the clean
...
tree to get rid of multiple typos in CS comments and
unify the patch.
2006-01-19 05:56:06 +03:00
andrey@lmy004.
0322cb1df8
- fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON)
...
Before the interval expression was considered to be in seconds, now it is
just a number and the type of interval is considered.
- this changeset introduces also fix for bug#16432 (Events: error re interval
misrepresents the facts)
the code of event_timed::set_interval() was refactored anyway so it is meaningful to
fix the bug in the same changeset.
2006-01-18 20:41:22 +01:00
bar@mysql.com
0e665a7aa5
sql_show.cc:
...
Don't display charsets/collations with HIDDEN flag.
ctype-utf8.c:
Adding HIDDEN flag to "filename"
Changeing ID to 17 which was previosly
used by deprecated "win1251", removed in 4.1.
charset-def.c:
Adding "filename" as a hidden charset, for test purposes.
m_ctype.h:
Adding MY_CS_HIDDEN flag,
to hide charsets and collations from
being displayed in SHOW.
2006-01-18 12:27:02 +04:00
knielsen@mysql.com
2ad568d421
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-relmerge
2006-01-17 18:35:16 +01:00
serg@serg.mylan
442e328ee9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-17 18:35:13 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
6bf5c9113d
WL #2747 : Fix such that backup and restore works for user defined
...
partitioned tables in NDB
2006-01-17 09:25:12 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
e802a94284
WL #2604 : Partition Management
...
Optimised version of ADD/DROP/REORGANIZE partitions for
non-NDB storage engines.
New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
Quite a few bug fixes
2006-01-17 08:40:00 +01:00
serg@serg.mylan
ae3d815b41
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
serg@serg.mylan
5b9b3ccb4c
only use "public" types in plugin API
2006-01-16 15:17:45 +01:00
evgen@moonbone.local
7f0aa55e36
Manually merged
2006-01-16 16:57:15 +03:00
knielsen@mysql.com
12cb3f4c5e
Windows/Visual Studio 2003 fixes for the 5.1.5 release.
2006-01-13 22:09:48 +01:00
anozdrin@mysql.com
4e1ccbe244
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15103
...
into mysql.com:/home/alik/MySQL/devel/5.1-tree
2006-01-13 19:46:39 +03:00
anozdrin@mysql.com
b1705ae5c4
Merge BUG#15110 from 5.0 into 5.1.
...
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:09:27 +03:00
tomas@poseidon.ndb.mysql.com
e648a8fe52
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/v7
2006-01-13 03:17:09 +01:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4
wl2325 wl2324
2006-01-12 19:51:02 +01:00
jani@ua141d10.elisa.omakaista.fi
617585eb33
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-01-12 20:28:23 +02:00
jani@ua141d10.elisa.omakaista.fi
8c6a32b997
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2006-01-12 17:47:58 +02:00
jani@ua141d10.elisa.omakaista.fi
af845f6eff
NetWare specific change to increase thread stack size.
...
Changes to Netware specific mysqld_safe.c
2006-01-12 15:10:12 +02:00
ingo@mysql.com
16437321cb
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
...
NDB cluster is not fully supported. This will be added with
WL 1892 (NDB Handler: Add support for CREATE/DROP INDEX).
Some preparatory code for this is already present though.
A change for the "duplicate key" error message is planned
for another changeset.
2006-01-12 10:05:07 +01:00
knielsen@mysql.com
c1587a7546
Merge changeset 1.2031.1.1 06/01/11 16:18:11 reggie@linux.site into 5.1.5-alpha release clone
2006-01-12 09:18:34 +01:00
reggie@linux.site
b03abd2888
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into linux.site:/home/reggie/work/mysql-5.0
2006-01-11 16:34:51 -06:00
reggie@linux.site
8de137a3aa
simple Windows compile fixes.
2006-01-11 16:18:11 -06:00
andrey@lmy004.
079237a90f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 16:06:05 +01:00
konstantin@mysql.com
4d272aba67
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-11 17:49:56 +03:00
konstantin@mysql.com
9105d06dd6
A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
...
rename sha1_* to mysql_sha1_*
2006-01-11 17:31:52 +03:00
anozdrin@mysql.com
b04b851ef9
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
...
There are two main idea of this fix:
- introduce a common function for server and client to split user value
(<user name>@<host name>) into user name and host name parts;
- dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
andrey@lmy004.
7c049782fa
WL #1034 (Internal CRON)
...
merge before push
2006-01-10 21:02:19 +01:00
svoj@april.(none)
1e8e3856da
Fixed warnings.
2006-01-10 15:05:31 +04:00
msvensson@neptunus.(none)
d7a4c502fe
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
2006-01-09 17:05:36 +01:00
msvensson@neptunus.(none)
0e7953d8b3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
2006-01-09 15:31:38 +01:00
msvensson@neptunus.(none)
dad7268273
Add yassl libs to libmysqlclient_r as well.
...
Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
Similiar to readline)
2006-01-09 10:01:07 +01:00
serg@serg.mylan
923e7cfd73
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-07 14:50:03 +01:00
serg@serg.mylan
cfbaad9952
WL#2935 - SHOW STATUS support in plugins
...
The patch adds DYNAMIC_ARRAY all_status_vars, which is now the
sole source of status information for SHOW STATUS. Status
variables can be added to and removed from the array dynamically.
SHOW STATUS command uses this array instead of static array
from mysqld.cc
Compatibility with the old, global list of status variables is
preserved in init_server_components(), where this global list is
simply appended to all_status_vars.
2006-01-07 14:41:57 +01:00
serg@serg.mylan
8dc77f267b
merged
2006-01-06 18:26:59 +01:00
knielsen@mysql.com
b41bbfa564
Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-05 23:45:52 +01:00
knielsen@mysql.com
b197c9abea
Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-01-05 23:41:10 +01:00
knielsen@mysql.com
71215d0cbc
Port to Win64/x64 in Visual Studio 2005
2006-01-05 23:39:45 +01:00
knielsen@mysql.com
eed5285e8c
Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-05 10:54:14 +01:00
knielsen@mysql.com
ed7c09da36
Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-01-05 10:45:34 +01:00
konstantin@mysql.com
f4cc6c4d15
Merge mysql.com:/opt/local/work/mysql-5.0-merge
...
into mysql.com:/opt/local/work/mysql-5.1-merge
2006-01-05 00:38:51 +03:00
knielsen@mysql.com
f13dff7a72
EADDRINUSE is not defined on Windows.
2006-01-04 16:38:54 +01:00
msvensson@neptunus.(none)
2362c7314a
Merge neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
...
into neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
2006-01-04 16:34:03 +01:00
msvensson@neptunus.(none)
5bacd5067f
Add yassl libs to libmysqlclient_r as well.
...
Add a link to extra/yassl/include/openssl to inlude when compiling with yassl
Similiar to readline)
2006-01-04 16:33:06 +01:00
konstantin@mysql.com
6502e6bba7
Merge mysql.com:/opt/local/work/mysql-4.1-7209-new
...
into mysql.com:/opt/local/work/mysql-5.0-merge
2006-01-04 17:49:45 +03:00
konstantin@mysql.com
f7d6fa6f17
A fix for Bug#7209 "Client error with "Access Denied" on updates
...
when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.
2006-01-04 17:35:30 +03:00
holyfoot@mysql.com
42dd692212
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
2006-01-04 14:28:41 +04:00
holyfoot@deer.(none)
e8697cf428
Big patch to make embedded-server working in 5.x
...
Now it supports queries returning several results
(particularly important with the SP)
2006-01-04 14:20:28 +04:00
serg@serg.mylan
8241a5a8e8
cleanup
2006-01-04 10:36:49 +01:00
serg@serg.mylan
30c09d6dc0
merged
2006-01-03 18:12:03 +01:00
serg@serg.mylan
14f94dc0ca
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
knielsen@mysql.com
03e47beb07
Compile fixes for aix52-64bit.
2006-01-01 22:18:02 +01:00
serg@serg.mylan
70d13a7cb7
plugin versioning: we cannot assume that sizeof(st_mysql_plugin)
...
is the same in the plugin and in the mysqld.
store the size in the plugin.
To simplify access to plugin's st_mysql_plugin, copy it on open and
convert to the latest version, so that the rest of the code would
not need to care about versions.
2006-01-01 16:43:34 +01:00
bar@mysql.com
6ff211329f
WL#1324 table name to file name encoding
...
- Encoding itself, implemented as a charset
"filename". Originally planned to use '.'
as an escape character, but now changed to '@'
for two reasons: "ls" does not return
file names starting with '.' considering them
as a kind of hidden files; some platforms
do not allow several dots in a file name.
- replacing many calls of my_snprintf() and
strnxmov() to the new build_table_filename().
- Adding MY_APPEND_EXT mysys flag, to append
an extention rather that replace it.
- Replacing all numeric constants in fn_format
flag arguments to their mysys definitions, e.g.
MY_UNPACK_FILENAME,
- Predictability in several function/methods:
when a table name can appear with or withot .frm
extension. Some functions/methods were changed
so accept names strictly with .frm, other - strictly
without .frm extensions. Several DBUG_ASSERTs were
added to check whether an extension is passed.
Many files:
table name to file name encoding
mysql_priv.h:
Prototypes for new table name encoding tools.
ctype-utf8.c:
Implementing "filename" charset for
table name to file name encoding.
row0mysql.c:
Fixing table name prefix.
mf_format.c:
Adding MY_APPEND_EXT processing.
Many files:
Fixing tests.
my_sys.h:
Adding new flag to append rather than replace an extension.
m_ctype.h:
Adding "filename" charset definition.
2005-12-31 09:01:26 +04:00
serg@serg.mylan
a2689bae45
after pull fixes
2005-12-29 21:29:02 +01:00
joerg@mysql.com
59ea719936
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0
2005-12-29 13:41:56 +01:00
kent@mysql.com
eaffb7eb73
config-win.h:
...
Backported Windows MAX_INDEXES handling from 5.1
2005-12-28 18:35:22 +01:00
svoj@mysql.com
a3f445151f
WL#2575 - Fulltext: Parser plugin for FTS
...
Manual merge.
2005-12-28 16:05:30 +04:00
stewart@mysql.com
cac298e07b
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
2005-12-28 13:55:59 +11:00
serg@serg.mylan
d5d6b51422
remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source
2005-12-24 14:32:50 +01:00
lars@mysql.com
ad126d90e0
WL#1012: All changes as one single changeset.
...
This includes both code and test cases.
2005-12-22 06:39:02 +01:00
acurtis@xiphis.org
9e3a6897c9
plugin version changes
2005-12-21 12:50:50 -08:00
acurtis@xiphis.org
9d4d1e81b8
Merge xiphis.org:/home/antony/work2/mysql-5.1
...
into xiphis.org:/home/antony/work3/mysql-5.1-plugable-2
2005-12-21 10:26:39 -08:00
acurtis@xiphis.org
13a776778c
Finalize storage engine plugins
...
Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code
2005-12-21 10:18:40 -08:00
bar@mysql.com
5f91dd6fad
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.xml
2005-12-21 17:14:58 +04:00
bar@mysql.com
519f9d628c
Adding XPath support: ExtractValue and UpdateXML functions.
...
libmysqld/Makefile.am:
sql/Makefile.am:
Adding new source files.
Adding new file into build process.
include/my_xml.h:
strings/xml.c:
Adding new XML parse flags to skip text normalization and
to use relative tag names. Adding enum for XML token types.
sql/lex.h:
Making parser aware of new SQL functions.
sqll/item_create.h, sql/item_create.cc:
Adding creators for ExtractValue and UpdateXML.
sql/item.h:
Adding new Item types: nodeset and nodeset comparator.
sql/item_xmlfunc.h
sql/item_xmlfunc.cc
Adding new classes implementing XPath functions.
mysql-test/t/xml.test, mysql-test/r/xml.result:
New files: adding test case
2005-12-21 17:13:52 +04:00
vtkachenko@melody.mysql.com
d1b5981693
Merge bk-internal:/home/bk/mysql-5.1-new
...
into melody.mysql.com:/home/vadim/mysql-5.1-new
2005-12-21 09:07:06 +01:00
vtkachenko@melody.mysql.com
22c930c924
Fast mutexes implementation
...
(spin-loop inside pthread_mutex_lock).
thr_mutex.c:
Added spinloop in mutex_lock
my_pthread.h:
Added definition of my_pthread_fastmutex_t
configure.in:
Added --with-fast-mutexes switch
2005-12-20 14:56:45 +01:00
kent@mysql.com
6e276f03be
my_sys.h:
...
Added MAP_NORESERVE set to 0 for Windows
config-win.h:
If MAX_INDEXES is not set, set it to 64 on Windows
2005-12-19 23:23:53 +01:00
kent@mysql.com
b898368a93
my_global.h:
...
Fix for bug #15841 : Change in sql_map.cc and mmap breaks on HP-UX
- in order to enable the mmap64() (and others) define
_LARGEFILE64_SOURCE in case of _LARGEFILE_SOURCE defined on HPUX.
2005-12-19 17:00:53 +01:00
vtkachenko@quadxeon.mysql.com
e9282ff3d0
Bug fix for bug #15843 "Added mmap support in myisam creates compile problem
...
on AIX 5.2"
Added dummy definition of MAP_NORESERVE for systems which doesn't provide it,
removed duplicates
my_sys.h:
added definition for MAP_NORESERVE
(for Irix and AIX systems)
sql_map.cc:
removed definition of MAP_NORESERVE
mi_packrec.c:
removed definition of MAP_NORESERVE and MMAP_PRIVATE
2005-12-19 14:16:21 +01:00
holyfoot@mysql.com
473580f085
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2005-12-15 22:06:02 +04:00
holyfoot@mysql.com
c80ecb5501
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2005-12-15 21:00:14 +04:00
jonas@perch.ndb.mysql.com
2180197c9b
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-15 15:11:42 +01:00
holyfoot@deer.(none)
dec0720a80
bug #15524 (partitioning range/list violation error message is insufficient)
2005-12-15 16:20:56 +04:00
joerg@trift-lap.fambruehe
0aaec93781
Merge joerg@trift2:/M50/part3-kent-joerg
...
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
2005-12-15 12:10:00 +01:00
ingo@mysql.com
340358481d
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0
2005-12-14 18:20:19 +01:00