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

45449 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@pippilotta.erinye.com
7c2433a059 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-27701 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-04-23 10:48:40 +02:00
joerg@debian.(none)
a9e05f8ce5 Merge debian.(none):/M50/push-5.0 
into  debian.(none):/M51/push-5.1
 2007-04-20 12:15:57 +02:00
joerg@debian.(none)
4c00b6fd26 Merge debian.(none):/M51/mysql-5.1 
into  debian.(none):/M51/push-5.1
 2007-04-20 11:58:56 +02:00
joerg@debian.(none)
cd8359720e Merge debian.(none):/M50/bug27739-5.0 
into  debian.(none):/M51/bug27739-5.1
 2007-04-20 11:03:13 +02:00
joerg@debian.(none)
5de73f45f9 configure.in : Ensure that "icheck" is really the ABI checker, 
not some other tool (file system checker on Tru64).

Patch originally supplied by Peter O'Gorman, slightly modified by me.

Bug#27739 "build fails on Tru64 due to icheck test in configure"
 2007-04-20 10:51:53 +02:00
joerg@debian.(none)
5d4a912e54 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  debian.(none):/M50/push-5.0
 2007-04-18 18:11:36 +02:00
joerg@trift2.
2a63d29d81 Merge trift2.:/MySQL/M50/fix-ndb-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-18 17:12:18 +02:00
joerg@trift2.
fd5c19d801 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-04-18 16:56:08 +02:00
joerg@trift2.
30dd22503e Merge trift2.:/MySQL/M50/fix-ndb-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-04-18 16:52:05 +02:00
joerg@trift2.
5fc30d25ea sql/ha_ndbcluster.cc 
Hex constants that exceed 32 bit need to be marked "LL" for the compile to work.
 2007-04-18 16:41:38 +02:00
joerg@debian.(none)
9aa59cb934 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  debian.(none):/M50/push-5.0
 2007-04-18 13:11:17 +02:00
serg@janus.mylan
dc981fc2dc added a necessary break 2007-04-17 21:15:15 +02:00
jamppa@bk-internal.mysql.com
b465b30847 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
 2007-04-17 15:45:35 +02:00
serg@janus.mylan
da240229f8 Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build
 2007-04-17 15:44:30 +02:00
kent/mysqldev@mysql.com/production.mysql.com
c43a7b9bf7 Raise version number after cloning 5.0.40 2007-04-17 15:22:48 +02:00
joerg@trift2.
7139131674 Merge trift2.:/MySQL/M50/limit-man-5.0 
into  trift2.:/MySQL/M51/limit-man-5.1
 2007-04-17 14:45:21 +02:00
joerg@trift2.
8d179a18fe Merge trift2.:/MySQL/M50/limit-man-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-17 14:42:05 +02:00
joerg@trift2.
e7788a9f1b Cleanup: The temporary file could be left around if nothing was excluded. 2007-04-17 14:41:07 +02:00
monty@narttu.mysql.fi
c33a5461d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/home/my/mysql-5.1
 2007-04-17 14:43:17 +03:00
monty@mysql.com/narttu.mysql.fi
0a35bd923f Fixed federated and some replication tests to not stop slave until it's up and running. 
(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs)
Marked federated_server as a '--big-test'
Change error in net_clear to 'Note', as it interfered with mysql-test-run.
 2007-04-17 14:41:16 +03:00
joerg@trift2.
8c57f57855 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/limit-man-5.1
 2007-04-17 12:46:23 +02:00
joerg@trift2.
6feaf3c726 Merge trift2.:/MySQL/M50/limit-man-5.0 
into  trift2.:/MySQL/M51/limit-man-5.1

Fixes during manual merge, due to the "plugin" naming of configure variables in 5.1
 2007-04-17 12:43:02 +02:00
serg@janus.mylan
562b4d968a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.0
 2007-04-17 12:32:40 +02:00
serg@janus.mylan
d5b1c3aea2 reverted the fix for Bug#5507 2007-04-17 12:32:01 +02:00
joerg@trift2.
174330e36a Merge trift2.:/MySQL/M50/limit-man-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-17 12:23:04 +02:00
joerg@trift2.
8437fd62b2 Let the "configure" options that control table handlers (NDB, InnoDB) or features ("embedded") 
also control the list of man pages installed, so that they correspond better to the binaries.

This is the second version of this fix, including review comments.
 2007-04-17 12:18:17 +02:00
aelkin@dl145j.mysql.com
5c53b59427 Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() 
refining the test with active innodb
 2007-04-16 19:20:46 +02:00
aelkin@dl145j.mysql.com
b49cb4fbb4 Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() 
tests for the bug and associated is moved into another file because
they appeared to be binlog-format sensitive.
 2007-04-16 16:55:37 +02:00
monty@mysql.com/narttu.mysql.fi
72d135bec5 Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc) 
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
 2007-04-16 17:08:29 +03:00
joerg@trift2.
d1d95cca9c Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-16 11:30:06 +02:00
joerg@trift2.
f5fc1472ff Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-04-16 11:20:36 +02:00
evgen@moonbone.local
bfac9ea67e subselect.result: 
After merge fix.
 2007-04-15 12:16:32 +04:00
evgen@moonbone.local
392fb72f5c Merge moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
 2007-04-15 12:05:13 +04:00
evgen@moonbone.local
7d71d58076 item.cc: 
Fix warning after fix for bug#27321.
 2007-04-15 09:54:16 +04:00
evgen@moonbone.local
51badaddbc subselect.test, subselect.result: 
After merge fix.
 2007-04-15 09:22:45 +04:00
evgen@moonbone.local
922a5a969c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql
 2007-04-15 08:41:35 +04:00
evgen@moonbone.local
3113ce6383 Bug#27321: Wrong subquery result in a grouping select. 
The Item_outer_ref class based on the Item_direct_ref class was always used
to represent an outer field. But if the outer select is a grouping one and the 
outer field isn't under an aggregate function which is aggregated in that
outer select an Item_ref object should be used to represent such a field.
If the outer select in which the outer field is resolved isn't grouping then
the Item_field class should be used to represent such a field.
This logic also should be used for an outer field resolved through its alias
name.

Now the Item_field::fix_outer_field() uses Item_outer_field objects to
represent aliased and non-aliased outer fields for grouping outer selects
only.
Now the fix_inner_refs() function chooses which class to use to access outer
field - the Item_ref or the Item_direct_ref. An object of the chosen class
substitutes the original field in the Item_outer_ref object.
The direct_ref and the found_in_select_list fields were added to the
Item_outer_ref class.
 2007-04-15 08:31:34 +04:00
holyfoot/hf@hfmain.(none)
b15a771541 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-14 14:56:41 +05:00
holyfoot/hf@hfmain.(none)
13a7fdac24 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-14 14:56:07 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
db7e62e7fb Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-14 14:55:33 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8b49f27530 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-14 14:54:59 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
cf18d38c83 Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
 2007-04-14 14:54:28 +05:00
epotemkin@bk-internal.mysql.com
9e2dcb5e91 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-04-13 23:32:23 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
455b325b53 Avoid resetting a variable. Fixed grant.test. 2007-04-13 14:04:57 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
defddfd255 Merged from 5.0 2007-04-13 12:47:44 +03:00
joerg@trift2.
6aae2bfe9f Merge trift2.:/MySQL/M50/bug27456-5.0 
into  trift2.:/MySQL/M51/bug27456-5.1
 2007-04-13 10:53:35 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
52196018ce Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
 2007-04-13 10:25:33 +03:00
tomas@whalegate.ndb.mysql.com
2a917850d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-13 08:15:49 +02:00
tomas@whalegate.ndb.mysql.com
51d5c403fa Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
 2007-04-13 08:15:07 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
104824a90f Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-4.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
 2007-04-13 09:14:47 +03:00