mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45450 commits 2784 branches 343 tags 1.6 GiB
Commit graph

45450 commits

This branch
This branch
All branches
Author SHA1 Message Date
mskold/marty@linux.site
fb6b0708b1 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-04-24 14:29:35 +02:00
mskold/marty@mysql.com/linux.site
eaba3f2548 ha_ndbcluster.h, ha_ndbcluster.cc: 
Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
Makefile.am:
  Added compilation of ha_ndbcluster_cond
ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc:
  Merge
 2007-04-24 14:24:06 +02:00
mskold/marty@mysql.com/linux.site
25ecc73891 Moved method definition to ease merge to 5.1 2007-04-24 11:17:27 +02:00
mskold/marty@linux.site
b4b9a326b5 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-04-24 10:39:21 +02:00
mskold/marty@mysql.com/linux.site
c68a4c9c6f Back-ported compiler warning fixes from 5.1 to ease merging 2007-04-24 10:25:15 +02:00
mskold/marty@mysql.com/linux.site
91fb8b646f Changed void* to const NdbDictionary::Table* 2007-04-23 12:12:44 +02:00
mskold/marty@mysql.com/linux.site
4ce556cdde Changed descriptive comment 2007-04-23 11:27:13 +02:00
mskold/marty@mysql.com/linux.site
5d4f9e22b1 Moved all code related to engine_condition_pushdown to a new class, 
ha_ndbcluster_cond.
Added new files:
sql/ha_ndbcluster_cond.h
sql/ha_ndbcluster_cond.cc
 2007-04-23 11:25:33 +02:00
mskold/marty@linux.site
44c80020b4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-04-19 15:52:31 +02:00
mskold/marty@mysql.com/linux.site
098adcb465 Commented out buggy debugging code 2007-04-19 15:48:17 +02:00
marty@linux.site
607838a126 Bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb, Bug #25296 Truncate table converts NDB disk based tables to in-memory tables: Added more checks in tests 2007-04-19 10:48:24 +02:00
marty@linux.site
b80c1c3dc2 Bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb, Bug #25296 Truncate table converts NDB disk based tables to in-memory tables: Check table storage before creating columns 2007-04-18 17:38:55 +02:00
tomas@poseidon.mysql.com
78e4f1e74c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-04-18 07:55:31 +02:00
tomas@poseidon.mysql.com
1ccd09a2c1 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-04-18 07:52:45 +02:00
tomas@poseidon.mysql.com
3468836c76 use define instead of value 2007-04-18 07:50:58 +02:00
jonas@perch.ndb.mysql.com
f7115f126b 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-17 16:50:08 +02:00
jonas@perch.ndb.mysql.com
6a35dddef4 ndb - bug#21755 
redo checkSchemaState to handle bug (plus prepare to handle other DD related bugs in the area)
 2007-04-17 16:43:47 +02:00
jonas@perch.ndb.mysql.com
4810b84c3c ndb - 
new big test prg testDict -n DictRestart
  new bug test prg testDict -n Bug21755
 2007-04-17 16:31:21 +02:00
jonas@perch.ndb.mysql.com
539c67e32a ndb - make NdbMixRestarter a bit more verbose 2007-04-17 16:26:16 +02:00
jonas@perch.ndb.mysql.com
930f5cc234 ndb - 
refactor testSRBank and create new class NdbMixRestarter
 2007-04-17 09:54:36 +02:00
jonas@perch.ndb.mysql.com
527158baa5 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-16 19:05:19 +02:00
tomas@whalegate.ndb.mysql.com
8523118ceb 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-16 14:55:40 +02:00
tomas@whalegate.ndb.mysql.com
5ee4948dec Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-04-16 14:51:55 +02:00
tomas@whalegate.ndb.mysql.com
a30755427a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-04-16 14:51:08 +02:00
tomas@whalegate.ndb.mysql.com
e1f8ffa5b3 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-16 14:16:25 +02:00
tomas@whalegate.ndb.mysql.com
be01d89661 some more tests + drop stuff after done 2007-04-16 14:15:30 +02:00
tomas@whalegate.ndb.mysql.com
1bf8aad558 Bug #27710 Creating unique index fails during single user mode 
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
 2007-04-16 14:07:31 +02:00
tomas@whalegate.ndb.mysql.com
03c6d037fc Bug #27710 Creating unique index fails during single user mode 
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
 2007-04-16 13:08:09 +02:00
tomas@whalegate.ndb.mysql.com
2c723aa91f Bug #27712 Single user mode. Creating logfile group and tablespace is allowed 2007-04-16 11:43:14 +02:00
jonas@perch.ndb.mysql.com
ee9448162c ndb - 
fix COPY_ROWID return value
 2007-04-16 10:00:03 +02:00
tomas@whalegate.ndb.mysql.com
9ca17d3ceb Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-15 23:02:32 +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
tomas@whalegate.ndb.mysql.com
10d4ae7a49 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-14 13:43:34 +02: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
msvensson@pilot.blaudden
f1776dc551 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-13 16:14:54 +02:00
msvensson@pilot.blaudden
8fdf9c5f64 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-13 16:14:43 +02:00
msvensson@pilot.blaudden
2aef31fa51 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-13 15:13:12 +02:00
msvensson@pilot.blaudden
9abaacca9c Merge pilot.blaudden:/home/msvensson/mysql/bug27783/my50-bug27783 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-13 15:06:52 +02:00
msvensson@pilot.blaudden
86a364319d Add option manual-ddd 
Change syntax for starting manual ddd or gdb to avoid having to
change working dir
 2007-04-13 15:06:05 +02:00
msvensson@pilot.blaudden
197a2677ad Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-13 15:02:10 +02:00