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

45029 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith@quadxeon.mysql.com
f14c2448c3 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
 2007-04-04 11:38:15 +02:00
tsmith@quadxeon.mysql.com
ab15c0fb94 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/50
 2007-04-04 11:06:48 +02:00
tsmith@quadxeon.mysql.com
2117193783 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
 2007-04-04 11:05:22 +02:00
Reggie@vm-xp.
66b0e9ca7a Bug #20376 Doesn't auto-detect data dir 
This changeset fixes the problem where mysql, when run as a service,
can't "detect" it's own data directory.
 2007-04-03 15:05:33 -05:00
kostja@bodhi.local
49d0b0caee Fix a race that breaks the valgrind build. 2007-04-03 21:33:56 +04:00
msvensson@pilot.blaudden
b436722bf1 Remove the cleanup of table t1 until problem with lock is fixed 2007-04-03 16:13:23 +02:00
msvensson@pilot.blaudden
3efa2df721 Replace not portable "--system rm" with --remove_file 2007-04-03 13:36:58 +02:00
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
msvensson@pilot.blaudden
00905b20a4 Cleanup tables created by test cases 2007-04-03 11:36:33 +02: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
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
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
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
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
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
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
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
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
lars/lthalmann@mysql.com/dl145k.mysql.com
fcc2b7ae4b GLOBAL DEBUG variable does not work 2007-03-31 13:48:33 +02:00
lars/lthalmann@dl145k.mysql.com
395b3694a8 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-31 12:57:24 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
dd1ef14cfe Avoiding SESSION with debug, since it does not work in valgrind 2007-03-31 12:56:03 +02:00
lars/lthalmann@dl145h.mysql.com
2f0ecd6a14 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-31 12:38:20 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
cec17aa0ba Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-31 12:36:50 +02:00
ibabaev@bk-internal.mysql.com
466586472b Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
 2007-03-31 09:52:18 +02:00
igor@olga.mysql.com
0c5ba6246b Fixed bug #27154: memory corruption when using row equalities in where 
conditions.
When allocating memory for KEY_FIELD/SARGABLE_PARAM structures the
function update_ref_and_keys did not take into account the fact that
a single row equality could be replaced by several simple equalities.
Fixed by adjusting the counter cond_count accordingly for each subquery
when performing substitution of a row equality for simple equalities.
 2007-03-31 00:23:03 -07:00