mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52457 commits 2781 branches 343 tags 1.6 GiB
Commit graph

2870 commits

Author SHA1 Message Date
df@pippilotta.erinye.com
b2b965b534 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-16 06:16:00 +02:00
brian@zim.(none)
ab73475950 Added a test for pre-statement call, and fixed connection/deconnect code so that the rest of bbench can be ran by others. 2007-06-15 17:22:57 -07:00
df@pippilotta.erinye.com
c4262055d6 BUG#27861 merge to 5.1 2007-06-15 09:52:58 +02:00
df@pippilotta.erinye.com
973c541b5c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-06-15 09:36:05 +02:00
df@pippilotta.erinye.com
ec40b58aca Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-06-15 09:33:09 +02:00
georg@bing.site
7c02fbd147 Added yassl and taocrypt sources to mysqlclientlib 2007-06-15 09:18:58 +02:00
holyfoot/hf@hfmain.(none)
1e9373fd60 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 16:42:43 +05:00
holyfoot/hf@hfmain.(none)
8ccc50b303 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-06-14 16:41:10 +05:00
df@pippilotta.erinye.com
6f8a8a56ea Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-06-11 09:53:57 +02:00
df@pippilotta.erinye.com
2a5feca6d0 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-06-11 09:50:42 +02:00
holyfoot/hf@hfmain.(none)
db5ed17e70 Merge mysql.com:/home/hf/work/28333/my50-28333 
into  mysql.com:/home/hf/work/28333/my51-28333
 2007-06-09 15:50:22 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
96d07631b2 Bug #28333 Test "flush" tries to create a new thread - on only one platform 
on PPC/Debian Linux default stack size for a thread is too big.
As we use default thread settings in mysqltest, the
thread creation fails if we create lots of threads (as it
happens in flush.test). So now stack size is explicitly specified
for the mysqltest
 2007-06-09 00:39:23 +05:00
joerg@trift2.
449cd28598 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-06 19:59:18 +02:00
df@pippilotta.erinye.com
f1f4d22948 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-06-06 14:23:15 +02:00
df@pippilotta.erinye.com
a52a96f511 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-06-06 14:20:06 +02:00
tsmith@quadxeon.mysql.com
0ca0984f59 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 23:06:43 +02:00
tsmith@quadxeon.mysql.com
d2fe24d1ef Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
 2007-06-05 23:04:40 +02:00
tsmith@quadxeon.mysql.com
4b93804592 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 17:51:30 +02:00
joerg@trift2.
7c9a81687b Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-05 10:39:02 +02:00
df@pippilotta.erinye.com
1161d74a3a BUG#28860 port to 5.1 2007-06-04 14:29:54 +02:00
df@pippilotta.erinye.com
32f4cfb8a9 BUG#28860 USE_TLS not defined for mysqlclient.lib 2007-06-04 14:12:31 +02:00
joerg@trift2.
d822cf03e5 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-04 11:24:49 +02:00
igor@olga.mysql.com
ca49b83d5a Merge olga.mysql.com:/home/igor/mysql-5.1 
into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
 2007-06-03 22:52:02 -07:00
msvensson@pilot.(none)
64761758a3 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-02 09:06:21 +02:00
msvensson@pilot.(none)
be55062f64 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-02 09:05:37 +02:00
tomas@whalegate.ndb.mysql.com
eb5fd16e59 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-06-02 06:33:18 +02:00
msvensson@pilot.(none)
9fd2b5ffaf Move code after variable delcaration 2007-06-01 19:57:26 +02:00
msvensson@pilot.(none)
146e087186 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-01 14:53:58 +02:00
msvensson@pilot.(none)
721d25f8ab Merge pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-01 14:49:21 +02:00
msvensson@pilot.(none)
62f71f5d7a Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497 
into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497
 2007-06-01 12:38:54 +02:00
msvensson@pilot.(none)
d43153f274 Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_value 
into  pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
 2007-06-01 12:04:05 +02:00
msvensson@pilot.(none)
09c5c03cb2 Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures 
- Add funtion "query_get_value to allow reading a fields value
   into a $variable
 2007-06-01 12:01:42 +02:00
kostja@bodhi.(none)
16633169e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-06-01 12:12:06 +04:00
ibabaev@bk-internal.mysql.com
d460dc700a Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-06-01 06:33:37 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
2c8f4f9791 Added casts to avoid compiler warnings and fixed a wrong type. 
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.
 2007-05-31 17:45:22 +03:00
tsmith@quadxeon.mysql.com
298e5002e3 mysqldump.c: 
Fix harmless typo (caught thanks to warning)
 2007-05-31 00:40:56 +02:00
tsmith@quadxeon.mysql.com
e97729a38f mysqldump.c: 
Fix harmless typo (caught thanks to warning)
 2007-05-31 00:37:41 +02:00
dkatz@damien-katzs-computer.local
6490419bb6 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-05-30 16:45:54 -04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
67c34a2c3c bug#17654 --read-from-remote-server causes core 
fixing FD event issue that showed up on pb.
 2007-05-30 14:29:34 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
b035219762 Changed accidently added tabs back into spaces. 
Fixed a bug that came in merge.
 2007-05-28 14:37:39 +03:00
lars/lthalmann@dl145h.mysql.com
95068ddacb Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-05-28 09:25:40 +02:00
ibabaev@bk-internal.mysql.com
faf19f9d60 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-05-28 06:25:03 +02:00
ibabaev@bk-internal.mysql.com
040e46fc1c Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-05-28 00:05:38 +02:00
gshchepa/uchum@gleb.loc
fae737b426 Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
 2007-05-28 00:22:44 +05:00
dkatz@damien-katzs-computer.local
4a7cdfc05d Bug #24733 RESET MASTER run before dump with --delete-master-logs 
fixed by using flush logs, dumping, then doing PURGE MASTER LOGS TO 'binfile', instead
of deleting the log files at the beginning.
  
  NOTE: previously the delete-master-logs  would reset the log names back to
filename.00001. Now the trailing number doesn't get reset. This may need to be
documented.
 2007-05-27 11:50:10 -04:00
gshchepa/uchum@gleb.loc
2ee30b0b7f Fixed bug #28522: 
sometimes `mysqldump --hex-blob' overruned output buffer by '\0' byte.

The dump_table() function has been fixed to reserve 1 byte more for the
last '\0' byte of dumped string.
 2007-05-25 17:24:17 +05:00
jani@a88-113-38-195.elisa-laajakaista.fi
fc3b3a0a86 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-05-24 13:24:36 +03:00
knielsen@ymer.(none)
9bf9755f09 Fix comments and option description in mysqlslap. 2007-05-24 11:27:59 +02:00
cbell/Chuck@mysql_cab.
0ce86cdc51 BUG#17654 : --read-from-remote-server causes core 
This patch corrects a problem encountered when reading the binlog from a remote
host. The application was crashing because the buffer variable (temp_buf) in 
log_event was not pointing to the incoming data. For a normal file read, this 
buffer is allocated by a previous call of read_log_event. However, when reading
from a remote host, the first call to read_log_event is not executed therefore
no buffer is allocated. Furthermore, there is no need to allocate a new buffer 
because the incoming stream is what needs to be read. 

This patch adds the call to initialize the temp_buf variable if reading from a 
remote host. It also adds a check at destroy time to ensure the temp_buf is not
freed if reading from a remote host.
 2007-05-22 10:50:32 -04:00
msvensson@pilot.blaudden
cdef920866 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-18 13:01:05 +02:00