mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36152 commits 2778 branches 343 tags 1.6 GiB
Commit graph

36152 commits

This branch
This branch
All branches
Author SHA1 Message Date
ingo@mysql.com
b2f58e94b1 After merge fix 2006-07-04 12:34:23 +02:00
tomas@poseidon.ndb.mysql.com
412082ebdd Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-07-04 11:56:44 +02:00
tomas@poseidon.ndb.mysql.com
98874725e0 Bug #20784 Uninitialized memory in update on table with PK not on first column 
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
 2006-07-04 11:43:06 +02:00
tomas@poseidon.ndb.mysql.com
8a2694e25f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-07-04 11:21:19 +02:00
ingo@mysql.com
d8546d07f8 Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-07-04 10:02:11 +02:00
jonas@perch.ndb.mysql.com
2f22f5aa21 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-07-04 09:38:46 +02:00
mskold@linux.site
f5fb7ef27a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1-extra
 2006-07-04 09:17:32 +02:00
cmiller@zippy.(none)
267aeffca3 Renumber events to make tests pass. This must be a result of removing extraneous 
COMMITs -- the numbers collapse to fill the gaps.
 2006-07-03 23:17:53 -04:00
cmiller@zippy.(none)
5db7673f88 Removed extraneous COMMITs, from Bug#16206. 2006-07-03 19:03:47 -04:00
cmiller@zippy.(none)
8caedc5efd Removed bdb test where the binlog format is indeterminate and updated a test 
where it isn't.  Removed a test where the merge was incorrect (and a test 
duplicated.)
 2006-07-03 18:29:01 -04:00
lars@mysql.com
ad119661a7 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
 2006-07-03 23:07:50 +02:00
aivanov@mysql.com
163c4d747c BUG#19209 "Test 'rpl_openssl' hangs on Windows" 
Disabling 'rpl_openssl'.
 2006-07-04 01:07:49 +04:00
aivanov@mysql.com
92fd2d1c2e BUG#19209 "Test 'rpl_openssl' hangs on Windows" 
Enabling rpl_openssl.test for Windows to check that
 currently it still hangs (because I can't reproduce
 this on my machine).
 2006-07-03 23:28:19 +04:00
cmiller@zippy.(none)
90aa83d5e0 Additional patch from Bug#16206. BEGIN/COMMIT behavior changed 5.0 -> 5.1 . 2006-07-03 13:49:25 -04:00
cmiller@zippy.(none)
6110a83a0e Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
 2006-07-03 11:35:58 -04:00
mskold@mysql.com
59d69f6d38 Fix for Bug #18413 Data usage for varsize columns are not correctly reported to mysqld 2006-07-03 17:09:32 +02:00
lars@dl145j.mysql.com
aed40706ff Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-07-03 13:10:46 +02:00
lars@mysql.com
ded6f32ac8 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-07-03 13:07:51 +02:00
pekka@clam.ndb.mysql.com
ea794df45a ndb - bug#20751 : report also composite op in merge 2006-07-03 12:13:57 +02:00
gluh@mysql.com
d2b378d57f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
 2006-07-03 13:19:18 +05:00
mikael@dator5.(none)
d5bb513021 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  dator5.(none):/home/pappa/bug17138
 2006-07-01 19:47:24 -04:00
dlenev@mysql.com
eb3ae6eb79 Merge mysql.com:/home/dlenev/mysql-5.0-bg18437-3 
into  mysql.com:/home/dlenev/mysql-5.1-bg18437
 2006-07-02 02:12:53 +04:00
dlenev@mysql.com
d4450e6696 Fix for bug#18437 "Wrong values inserted with a before update trigger on 
NDB table".

SQL-layer was not marking fields which were used in triggers as such. As
result these fields were not always properly retrieved/stored by handler
layer. So one might got wrong values or lost changes in triggers for NDB,
Federated and possibly InnoDB tables.
This fix solves the problem by marking fields used in triggers
appropriately.

Also this patch contains the following cleanup of ha_ndbcluster code:

We no longer rely on reading LEX::sql_command value in handler in order
to determine if we can enable optimization which allows us to handle REPLACE
statement in more efficient way by doing replaces directly in write_row()
method without reporting error to SQL-layer.
Instead we rely on SQL-layer informing us whether this optimization
applicable by calling handler::extra() method with
HA_EXTRA_WRITE_CAN_REPLACE flag.
As result we no longer apply this optimzation in cases when it should not
be used (e.g. if we have on delete triggers on table) and use in some
additional cases when it is applicable (e.g. for LOAD DATA REPLACE).

Finally this patch includes fix for bug#20728 "REPLACE does not work
correctly for NDB table with PK and unique index".
  
This was yet another problem which was caused by improper field mark-up.
During row replacement fields which weren't explicity used in REPLACE
statement were not marked as fields to be saved (updated) so they have
retained values from old row version. The fix is to mark all table
fields as set for REPLACE statement. Note that in 5.1 we already solve
this problem by notifying handler that it should save values from all
fields only in case when real replacement happens.
 2006-07-02 01:51:10 +04:00
konstantin@mysql.com
1c4dffc8ca Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-07-01 22:13:42 +04:00
sergefp@mysql.com
775ec4fb85 Post-merge fix 2006-07-01 09:28:41 +04:00
mikael@dator5.(none)
55109a802d Merge dator5.(none):/home/pappa/bug20583 
into  dator5.(none):/home/pappa/bug17138
 2006-07-01 00:28:04 -04:00
mikael@dator5.(none)
9e56572e5c Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug20583
 2006-07-01 00:22:25 -04:00
mikael@dator5.(none)
5853823bb2 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug17138
 2006-07-01 00:19:23 -04:00
mikael@dator5.(none)
4e390d711a BUG#17138: Crashes in stored procedure 
Last round of review fixes
 2006-07-01 00:01:37 -04:00
sergefp@mysql.com
f863685241 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/psergey/mysql-5.0-bug16168-merge
 2006-07-01 07:04:27 +04:00
evgen@moonbone.local
a3deb94518 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into moonbone.local:/work/merge-5.1
 2006-07-01 05:59:26 +04:00
evgen@moonbone.local
1459784aba Reverted wrong bug fix (Bug#11228) 2006-07-01 01:37:20 +04:00
sergefp@mysql.com
784b3118a5 Merge mysql.com:/home/psergey/mysql-4.1-bug16168-push 
into  mysql.com:/home/psergey/mysql-5.0-bug16168-merge
 2006-07-01 01:25:59 +04:00
konstantin@mysql.com
fbeb42a9e1 Remove an unused variable. 2006-07-01 00:33:47 +04:00
konstantin@mysql.com
41fea3d763 Remove a couple of unused/barely used names. 2006-07-01 00:14:28 +04:00
monty@mysql.com
f62829636b After merge fixes 2006-06-30 20:07:33 +03:00
knielsen@devsrv-b.mysql.com
79ebe92208 Merge bk-internal:/home/bk/mysql-5.1 
into  mysql.com:/data0/knielsen/tmp-5.1
 2006-06-30 18:20:45 +02:00
monty@mysql.com
2f86009c9e Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2006-06-30 19:15:18 +03:00
monty@mysql.com
445dfdc3a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-06-30 19:15:17 +03:00
tomas@poseidon.ndb.mysql.com
805551ead3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-30 18:15:16 +02:00
monty@mysql.com
2bec1b86bb Reverted wrong bug fix (Bug#11228) 2006-06-30 18:29:27 +03:00
tomas@poseidon.ndb.mysql.com
c8b65bb357 manual merge, patch only relevant for 4.1 2006-06-30 16:29:17 +02:00
tomas@poseidon.ndb.mysql.com
e61bfafaa9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-30 16:26:33 +02:00
tomas@poseidon.ndb.mysql.com
9f542ef0f4 adopted ndb handler code for tables without primary key and with unique index 
- added missing retrieval of hidden primary key
 2006-06-30 16:25:07 +02:00
kroki@mysql.com
96bddcafe7 Bug#17226: Variable set in cursor on first iteration is assigned 
second iterations value

During assignment to the BLOB variable in routine body the value
wasn't copied.
 2006-06-30 18:14:22 +04:00
knielsen@rt.int.sifira.dk
dcd9132fe7 Merge mysql.com:/usr/local/mysql/mysql-5.1-bindist 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-06-30 15:21:45 +02:00
knielsen@mysql.com
5b1c92244c Add a script scripts/make_win_bin_dist, used to generate a Windows 
binary disctribution for Falcon.
 2006-06-30 15:15:20 +02:00
evgen@moonbone.local
a989f7261e Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/merge-5.1
 2006-06-30 16:10:26 +04:00
evgen@moonbone.local
adbd5fb185 Manual merge 2006-06-30 16:09:14 +04:00
lars@mysql.com
78a9adb659 Changed the number of test iterations since this makes test time 
go from 623 seconds to 11 seconds on AMD64.
This is because we have no native atomic implementation on AMD64, 
so the rwlock-based implementation is used, which is  a bit slow.  
It will be probably be optimized for AMD64 quite soon, but for now 
this test case will do fewer iterations.
 2006-06-30 11:31:43 +02:00