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
45295 commits 2793 branches 343 tags 1.7 GiB
Commit graph

45295 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@bodhi.local
bed1ec3e7c Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-04-03 14:36:27 +04:00
kostja@bodhi.local
93d0316f45 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-04-03 14:34:37 +04:00
gni/root@dev3-221.dev.cn.tlan
e1971cfa51 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
 2007-04-03 18:05:10 +08:00
gni/root@dev3-221.dev.cn.tlan
96c37edd5c Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
 2007-04-03 18:01:43 +08:00
msvensson@pilot.blaudden
00905b20a4 Cleanup tables created by test cases 2007-04-03 11:36:33 +02:00
gluh@mysql.com/eagle.(none)
89dec159d1 Bug#27327 information_schema status views, variable_value conversion 
Type of 'Slave_running' status variable is changed to bool
 2007-04-03 14:24:35 +05:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c8d0b6fc89 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
 2007-04-03 17:07:00 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
85c0d0554c Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
 2007-04-03 17:03:12 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
0a29b7e7e3 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25295-5.1-new-ndb-bj
 2007-04-03 16:48:21 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ac4467e6c2 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25295-5.1-new-ndb-bj
 2007-04-03 16:45:47 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7b6216f4e Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25875-5.1-new-ndb-bj
 2007-04-03 16:43:24 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
cd1919321a Bug#25875, Newly created table through CREATE TABLE .. LIKE has no ndb_dd attributes 2007-04-03 16:40:16 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ce52a7bdc3 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug26898-5.1-new-ndb-bj
 2007-04-03 16:30:57 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7382b88fd Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug26898-5.1-new-ndb-bj
 2007-04-03 16:27:51 +08:00
tomas@whalegate.ndb.mysql.com
d2bcd58e5b Bug #26783 replication status unknown after cluster or mysqld failure 
- correction, wrong datatype used
 2007-04-03 09:53:15 +02:00
svoj@june.mysql.com
e6f629aff7 Merge mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.1-engines
 2007-04-03 12:38:15 +05:00
tomas@whalegate.ndb.mysql.com
7e9df0e9b6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-04-03 09:37:15 +02:00
tomas@whalegate.ndb.mysql.com
d019e94aed remove unused List 2007-04-03 09:30:05 +02:00
svoj@mysql.com/june.mysql.com
ccbdbe5713 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.0-engines
 2007-04-03 12:11:51 +05:00
msvensson@pilot.blaudden
4614ae5aea Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-03 08:05:30 +02:00
msvensson@pilot.blaudden
1e54f5a1a7 Work around for bug#27606 2007-04-03 08:04:25 +02:00
tomas@whalegate.ndb.mysql.com
2dc02167df Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-03 07:21:42 +02:00
tomas@whalegate.ndb.mysql.com
8bf9bf001d Bug #26783 replication status unknown after cluster or mysqld failure 
- update the ndb_apply_status table with binlog info
 2007-04-03 07:20:55 +02:00
msvensson@pilot.blaudden
39cca0323c Look for "testname.warnings" file produced by mysqltest, could find 
problems like misspelled -- commands
 2007-04-02 22:58:25 +02:00
iggy@recycle.(none)
5c0d886248 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug23491_ii/my50-bug23491_ii
 2007-04-02 16:25:06 -04:00
tomas@whalegate.ndb.mysql.com
aa7d01bca4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-02 22:24:04 +02:00
tomas@whalegate.ndb.mysql.com
33a995712f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-02 22:23:05 +02:00
iggy@recycle.(none)
b632f87f37 Merge recycle.(none):/src/bug23491_ii/my50-bug23491_ii 
into  recycle.(none):/src/bug23491_ii/my51-bug23491_ii
 2007-04-02 16:22:19 -04:00
iggy@recycle.(none)
19a2630641 Minor test cleanup. 2007-04-02 16:21:12 -04:00
tomas@whalegate.ndb.mysql.com
e372d0419a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-02 21:27:17 +02:00
tomas@whalegate.ndb.mysql.com
33680fa2f7 correction of manual merge 2007-04-02 21:26:27 +02:00
kostja@bodhi.local
31a8bfbe2e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-04-02 22:06:15 +04:00
tomas@whalegate.ndb.mysql.com
47d224aac3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-02 18:54:29 +02:00
tomas@whalegate.ndb.mysql.com
f2437037f3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-02 18:51:45 +02:00
tomas@whalegate.ndb.mysql.com
0accd5f242 corrected previos manual merge 2007-04-02 18:49:52 +02:00
tomas@whalegate.ndb.mysql.com
661453619e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-04-02 18:39:40 +02:00
tomas@whalegate.ndb.mysql.com
fb87082d32 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-02 18:28:42 +02:00
tomas@whalegate.ndb.mysql.com
c02efd8f1b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-02 18:22:33 +02:00
tomas@whalegate.ndb.mysql.com
dd6073f5d7 BUG#27560: Memory usage of mysqld grows while doing nothing 
The query-cache watch thread was continually allocating new thread entries on the
THD MEM_ROOT, not freed until server exit.
  
Fixed by using a simple array, auto-expanded as necessary.
 2007-04-02 18:21:05 +02:00
svoj@mysql.com/june.mysql.com
27d9265c26 BUG#25729 - boolean full text search is confused by NULLs produced by 
LEFT JOIN
Fixed that in certain situations MATCH ... AGAINST returns false hits
for NULLs produced by LEFT JOIN when there is no fulltext index
available.
 2007-04-02 17:26:39 +05:00
Kristofer.Pettersson@naruto.
6ca1e16e4e Type cast of constant string (empty) to keep compiler happy. 2007-04-02 14:03:33 +02:00
msvensson@pilot.blaudden
1e10ae36c1 After merge fix 2007-04-02 13:57:32 +02:00
msvensson@pilot.blaudden
82b454aa28 Bug#21611 Slave can't connect when master-ssl-cipher specified 
- Change check for return value of 'SSL_CTX_set_cipher_list'
   in order to handle 0 as error setting cipher.
 - Thanks to Dan Lukes for finding the problem!
 2007-04-02 13:12:59 +02:00
gluh@mysql.com/eagle.(none)
54bc9c3d77 Bug#27069 set with identical elements are created 
added the check for unique elements count in SET
 2007-04-02 15:01:19 +05:00
msvensson@pilot.blaudden
fc904eaead Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-02 11:15:09 +02:00
Kristofer.Pettersson@naruto.
a4b3a9d31d Merge naruto.:C:/cpp/bug26174/my51-bug26174 
into  naruto.:C:/cpp/mysql-5.1-runtime
 2007-04-02 11:09:32 +02:00
msvensson@pilot.blaudden
697b94a854 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-02 10:52:47 +02:00
msvensson@pilot.blaudden
bb9a601829 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-02 10:50:39 +02:00
msvensson@pilot.blaudden
252e3f03c7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-04-02 10:48:11 +02:00
msvensson@pilot.blaudden
cbe7c63fc7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-02 10:45:51 +02:00