mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37358 commits 2793 branches 343 tags 1.7 GiB
Commit graph

2359 commits

Author SHA1 Message Date
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