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

45264 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
msvensson@pilot.blaudden
cb3091c166 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-02 10:42:08 +02:00
msvensson@pilot.blaudden
c731bad918 Cset exclude: tsmith@siva.hindu.god|ChangeSet|20070328212513|13373 2007-04-02 10:39:23 +02:00
msvensson@pilot.blaudden
9692592143 Fix spelling error 2007-04-02 10:17:29 +02:00
msvensson@pilot.blaudden
a37acf9146 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-02 10:15:44 +02:00
msvensson@pilot.blaudden
a5bc60f559 Bug#27049 Race condition in test mysqlbinlog.test 
Remove the setting of --local-load parameter for mysqlbinlog and leave that to the testcases
to decide what params to use.
 2007-04-02 10:14:45 +02:00
Kristofer.Pettersson@naruto.
f85f0950a0 Bug#26174 Server Crash:INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS in Event 
- Some variables in I_S.GLOBAL_STATUS were depending on a network
  connection in order to evaluate. Since no network connection is 
  present during the execution of an event, this caused the server
  to crash.
- The variable function hooks does now verify that the vio-
  object is valid before attempting to use it.
 2007-04-02 09:51:14 +02:00
jonas@perch.ndb.mysql.com
2a29f0affe Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-04-02 09:45:58 +02:00
jonas@perch.ndb.mysql.com
fbcfa4be3d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-02 09:34:33 +02:00
jonas@perch.ndb.mysql.com
6f12c538c4 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-02 09:30:35 +02:00
jonas@perch.ndb.mysql.com
27902d6507 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-04-02 09:29:11 +02:00
jonas@perch.ndb.mysql.com
6f4b908b34 ndb - bug#27581 
make sure not to leave partially initialized pagerage-records
 2007-04-02 09:07:15 +02:00
jonas@perch.ndb.mysql.com
48e890be45 fix atrt mysql_install_db, make sure no extra my.cnf is read 2007-04-02 08:39:58 +02:00
jonas@perch.ndb.mysql.com
c77ffe4a26 ndb - fix bug in my.cnf config handling 
put64 for 64-bit variables
 2007-04-02 08:36:00 +02:00
ibabaev@bk-internal.mysql.com
898ec87e14 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-04-02 03:56:39 +02:00
ibabaev@bk-internal.mysql.com
8b8a61d77a Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-04-02 03:53:21 +02:00
igor@olga.mysql.com
5534f099f1 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-04-01 14:00:56 -07:00
lars/lthalmann@dl145k.mysql.com
048502086d Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-04-01 01:49:16 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
572c034485 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-04-01 01:48:21 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c32c54881e Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-04-01 01:46:38 +02:00
tomas@whalegate.ndb.mysql.com
fc6a077cc7 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-31 21:53:02 +02:00
lars/lthalmann@dl145k.mysql.com
579cee7f49 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-03-31 20:07:44 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
b7537e2ac4 New test case shows valgrind failure (disabling this 
new test case until the valgrind failure is fixed, 
reported in bug 27564)
 2007-03-31 19:49:05 +02:00
mats@romeo.(none)
bd86c0f459 Fix to rpl_row_create_table test. 2007-03-31 19:10:25 +02:00
svoj@mysql.com/april.(none)
8c1b109cc3 After merge fix. 2007-03-31 20:27:43 +05:00
msvensson@pilot.blaudden
a12213aa59 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-31 17:18:26 +02:00
msvensson@pilot.blaudden
d96319299b Add correct replace 2007-03-31 17:18:03 +02:00
msvensson@pilot.blaudden
706a7a8fb5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-31 15:14:13 +02:00
msvensson@pilot.blaudden
398c24d1a1 Bug#27049 Race condition in test mysqlbinlog.test 
- Add --local-load option to avoidthat the load data file requested
   by mysqlbinlog end up in local var/tmp dir and not in system global
   tmpdir
 2007-03-31 15:07:48 +02:00