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

32140 commits

This branch
This branch
All branches
Author SHA1 Message Date
brian@zim.(none)
9fc9d0f282 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-23 08:46:26 -08:00
bar@mysql.com
add4b40ebe 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 19:59:21 +04:00
brian@zim.(none)
aced117538 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-23 05:52:34 -08:00
brian@zim.(none)
bdfb7180ca Refactored some code to remove ifdef and removed dead code related to un-useable sync code. 2006-03-23 05:51:31 -08:00
lars@mysql.com
0ba9ad02ba Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-23 11:54:17 +01:00
pekka@mysql.com
c54b8647d4 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/export/space/pekka/ndb/version/my51
 2006-03-23 11:35:54 +01:00
lars@mysql.com
5c246eb985 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-23 11:17:00 +01: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
296d4b2f2c Bug#15376: Unassigned multibyte codes are converted to U+0000 
Mergeing changes into 5.0
 2006-03-23 14:03:39 +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
lars@mysql.com
9e357e7464 Merge mysql.com:/users/lthalmann/bk/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-23 09:38:17 +01:00
bar@mysql.com
fb7826ed25 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 12:27:23 +04:00
bar@mysql.com
a4d4ed9ec8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-23 12:27:10 +04:00
bar@mysql.com
e4b6264f6c Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-23 12:22:39 +04:00
lars@mysql.com
a35a81c7e5 New file to remove sleeps in mysql-test-run (backported from 5.1) 2006-03-23 09:19:01 +01:00
bar@mysql.com
6ed5cdfd57 ctype-czech.c: 
Fixing wrong min_sort_char.
 2006-03-23 12:15:13 +04:00
msvensson@neptunus.(none)
40e6821e07 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-23 08:51:24 +01:00
msvensson@neptunus.(none)
bc4f7bfd74 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-23 08:23:33 +01:00
msvensson@neptunus.(none)
ba2ddc869c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-23 08:22:11 +01:00
msvensson@neptunus.(none)
c6e6c0d649 Move the replcae result to before the correct select 2006-03-23 08:21:16 +01: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
ddc37c547f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-23 10:20:40 +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
pekka@mysql.com
a2263a1fbf ndb - bug#17813 schema.query => blob 2006-03-23 04:59:14 +01:00
monty@mysql.com
905dfa0375 Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0.17 and 
5.0.18 by not reseting or accessing the info_buffer member
 2006-03-23 00:37:40 +02:00
msvensson@neptunus.(none)
465b2d38db Fix unused variable warning 2006-03-22 22:37:32 +01:00
msvensson@neptunus.(none)
02b59fd317 Save core files before removing the data_dir 2006-03-22 22:34:48 +01:00
lars@mysql.com
68c2dffb02 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 18:12:10 +01:00
tomas@poseidon.ndb.mysql.com
6a3b28c25e 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 18:12:09 +01:00
tomas@poseidon.ndb.mysql.com
8598539ea1 ndb: added debug printout to track down a bug 2006-03-22 18:10:56 +01:00
lars@mysql.com
9dbc6eac4c Changed to real_sleep 2006-03-22 17:28:48 +01:00
lars@mysql.com
a8ba8a30a6 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 17:28:47 +01:00
msvensson@neptunus.(none)
123f513593 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 17:28:46 +01:00
lars@mysql.com
c07b9184aa Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 17:28:46 +01:00
tomas@poseidon.ndb.mysql.com
53317ff998 ndb: removed TransporterFacade singleton 2006-03-22 17:28:45 +01:00
msvensson@neptunus.(none)
7d3a809695 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-22 16:52:31 +01:00
msvensson@neptunus.(none)
13c5e780ed Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 16:48:35 +01:00
msvensson@neptunus.(none)
bbc4051826 Fix windows results using "replace_result" 2006-03-22 16:47:45 +01: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
128cb5821e changed comment in disabled.def 2006-03-22 16:04:38 +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
msvensson@neptunus.(none)
451a7129bb Bug#18071 Result from MATCH() uses too many decimals 
- Use FORMAT as a workaround to only output the first 6 decimals of the value returned
from MATCH
 - This has been done before
 2006-03-22 14:57:24 +01:00
bar@mysql.com
d735a60964 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-22 15:10:42 +04:00
msvensson@neptunus.(none)
46b5b6c644 Dsiable udf.test waiting for a check wheter udf_example.so exists 2006-03-22 12:03:15 +01:00
tomas@poseidon.ndb.mysql.com
940d0e8757 ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour 2006-03-22 11:45:14 +01:00
tomas@poseidon.ndb.mysql.com
046944dea0 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 11:13:29 +01:00
msvensson@neptunus.(none)
89a5b96ee4 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 11:12:28 +01:00
tomas@poseidon.ndb.mysql.com
886b1b8661 corrected previous patch 2006-03-22 10:54:55 +01:00