mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21833 commits 2781 branches 343 tags 1.6 GiB
Commit graph

21833 commits

This branch
This branch
All branches
Author SHA1 Message Date
istruewing@chilla.local
70554ee55d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1--main
 2007-03-07 20:17:17 +01:00
malff/marcsql@weblab.(none)
14e1ed367e Merge weblab.(none):/home/marcsql/TREE/mysql-4.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-4.1-runtime
 2007-03-01 05:59:16 -07:00
gbichot@dl145h.mysql.com
d204dc2d21 Fix for BUG#26050 "LOAD DATA INFILE breaks ACID"; the ok must be sent 
to the client only after the binlog write and engine commit.
No testcase for this bug, as to reproduce it, we need to "kill -9" mysqld,
which we cannot do in the testsuite. But, I tested by hand.
 2007-02-26 20:35:28 +01:00
istruewing@chilla.local
ce9be400ef Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1--main
 2007-02-26 13:31:52 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
a6458e1aee Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-02-25 00:10:06 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fc265e4e0a Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-02-24 11:36:15 +01:00
istruewing@chilla.local
dbbf5d02a9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1--main
 2007-02-21 00:06:23 +01:00
joerg@trift2.
74fed0c305 After-merge fix: 
The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".
 2007-02-20 13:10:27 +01:00
joerg@trift2.
0daf91a62a Merge trift2.:/MySQL/M40/clone-4.0 
into  trift2.:/MySQL/M41/merge-4.1
 2007-02-20 13:02:39 +01:00
thek@kpdesk.mysql.com
8f24815af1 Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my41-bug23240 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-runtime
 2007-02-19 15:26:07 +01:00
istruewing@chilla.local
237e50db12 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1--main
 2007-02-19 12:02:53 +01:00
thek@kpdesk.mysql.com
dd41fd5732 Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time 
- Starting time of a query sent by file bootstrapping wasn't initialized
  and starting time defaulted to 0. This later used value by the Now-
  item and is translated to 1970-01-01 11:00:00.
- marking the time with thd->set_time() before the call to 
  mysql_parse resolves this issue.
 2007-02-19 09:37:34 +01:00
joerg@trift2.
0cdbda1273 include/config-win.h : 
Companion change to this one
   ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
     include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
 2007-02-16 16:31:31 +01:00
joerg@trift2.
8ddb3af50c Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-02-15 13:46:54 +01:00
ibabaev@bk-internal.mysql.com
cf9aca84b3 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
 2007-02-13 21:25:22 +01:00
cmiller@zippy.cornsilk.net
11e8f48734 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-02-13 10:54:04 -05:00
holyfoot/hf@mysql.com/hfmain.(none)
ff6119bfba Merge bk@192.168.21.1:mysql-4.1-opt 
into  mysql.com:/home/hf/work/25492/my41-25492
 2007-02-13 01:18:52 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0004fa3c5b bug #25492 (Invalid deallocation in mysql_stmt_fetch) 2007-02-13 00:55:45 +04:00
joerg@trift2.
0ba571bac3 Fix a linkage problem with the previous patch for "thr_client_alarm". 2007-02-12 20:13:34 +01:00
joerg@trift2.
aa59e423d7 Break a double declare of "uint thr_client_alarm" between "mysys/thr_alarm.c" and "mysys/my_pthread.c". 2007-02-12 19:55:33 +01:00
joerg@trift2.
dd745750e5 Compile error on Windows: Signal names are undefined. Fix by hiding the whole section. 2007-02-12 15:03:11 +01:00
tnurnberg@mysql.com/sin.azundris.com
8dc8e07fcf Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/home/tnurnberg/24660/41-24660
 2007-02-12 14:39:45 +01:00
tnurnberg@mysql.com/sin.azundris.com
db7ac2c0c7 Bug#24660: "enum" field type definition problem 
ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales.
This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
being used. Now if 0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an error.

Any solution would have broken some sort of existing behaviour. This solution should
serve both fractions (those with 0xff and those with ',' in their enums), but
WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
That is, mysqldump with their current server, and restore when upgrading to one with
this patch.
 2007-02-12 14:31:44 +01:00
joerg@trift2.
9a1dd3d589 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-02-09 20:24:07 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
ab8d50b7df Fixes a compilation problem on Windows. Backport of the 
same fix from 4.0.
 2007-02-09 13:03:37 +02:00
tsmith@siva.hindu.god
4579445b2a Merge siva.hindu.god:/home/tsmith/m/bk/41 
into  siva.hindu.god:/home/tsmith/m/bk/maint/41
 2007-02-08 16:01:13 -07:00
malff/marcsql@weblab.(none)
dc8e36ebcf Merge weblab.(none):/home/marcsql/TREE/mysql-4.1 
into  weblab.(none):/home/marcsql/TREE/mysql-4.1-rtmerge
 2007-02-08 08:51:13 -07:00
gluh@mysql.com/eagle.(none)
da9f2149de Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2007-02-08 14:54:49 +04:00
tomas@poseidon.mysql.com
097c8431e2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.mysql.com:/home/tomas/mysql-4.1-ndb
 2007-02-08 00:25:30 +07:00
joerg@trift2.
4a97341436 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-02-07 13:54:18 +01:00
msvensson@pilot.mysql.com
b6da082559 Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 23:01:01 +01:00
msvensson@neptunus.(none)
2fb664cb38 Bug#25344 Segmentation violation when try to run the perror utility 
- strerror might return NULL on some platforms
 2007-02-06 23:00:18 +01:00
msvensson@pilot.mysql.com
256cb08ba9 Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:44:05 +01:00
msvensson@neptunus.(none)
6502f4300b Merge neptunus.(none):/home/msvensson/mysql/my41-nmj 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:42:40 +01:00
msvensson@pilot.mysql.com
36207f8088 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:27:43 +01:00
msvensson@pilot.mysql.com
3f06339d7c Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:27:00 +01:00
msvensson@neptunus.(none)
8c37b28c0b Bug#8983 one place that isn't strict-aliasing-safe 
- Backport fix from 5.0
 2007-02-06 14:07:40 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d69e5063b2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
 2007-02-06 14:58:07 +04:00
istruewing@synthia.local
6ec34262e2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  synthia.local:/home/mydev/mysql-4.1--main
 2007-02-06 10:46:16 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
1dd93dda08 Test and bug fixes and removed unneccessary files. 2007-02-05 17:09:44 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
64a728ce0c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
 2007-02-05 10:20:47 +04:00
istruewing@chilla.local
972df14cc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-02 20:23:03 +01:00
istruewing@chilla.local
177a366e53 After merge fix 2007-02-02 20:19:13 +01:00
gluh@mysql.com/eagle.(none)
938de5eee4 another valgrind error fix for 4.1(backport from 5.0) 2007-02-02 17:18:42 +04:00
gluh@mysql.com/eagle.(none)
31c3059ae9 Valgrind errors 
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
 2007-02-02 15:01:11 +04:00
istruewing@chilla.local
3a664472de After merge fix 2007-02-02 10:01:44 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2c45e72e04 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/home/ram/work/b26012/b26012.4.1
 2007-02-01 19:56:14 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d710853fb8 Fix for bug #26012: missed Field_double::size_of() 
As we have Field_double::not_fixed we must have Field_double::size_of().
 2007-02-01 19:51:02 +04:00
lzhou/zhl@dev3-63.(none)
e208018f75 Merge dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb
 2007-02-01 15:48:23 +00:00
istruewing@chilla.local
33e1d1091a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 15:51:25 +01:00