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

44072 commits

This branch
This branch
All branches
Author SHA1 Message Date
kent@kent-amd64.(none)
a947708760 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 17:53:25 +01:00
df@pippilotta.erinye.com
f6c30190b3 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.1-build-work
 2007-03-20 13:34:09 +01:00
df@pippilotta.erinye.com
56856d6f31 small build fix 2007-03-20 13:33:17 +01:00
df@pippilotta.erinye.com
8161dcaacb build fix for netware 2007-03-20 13:32:49 +01:00
df@pippilotta.erinye.com
e4a9917b6c 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-03-20 10:24:11 +01:00
df@pippilotta.erinye.com
5572ab1462 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-03-20 08:49:47 +01:00
ibabaev@bk-internal.mysql.com
45fb6c90f0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-03-20 03:59:32 +01:00
evgen@moonbone.local
41c732493e sql_insert.cc: 
After merge fix.
 2007-03-20 01:37:33 +03:00
evgen@moonbone.local
37add3b661 Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-03-20 01:29:09 +03:00
evgen@moonbone.local
31b9145ab3 sql_insert.cc: 
Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
trigger.test, trigger.result:
  Corrected test case for the bug#27006.
 2007-03-20 00:46:19 +03:00
df@pippilotta.erinye.com
eb0ddb2184 BUG#27270 Can't compile latest 5.1-main 2007-03-19 20:44:46 +01:00
omer@linux.site
f2d3a8f030 Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  linux.site:/home/omer/source/bld51_0314
 2007-03-17 03:19:22 -07:00
serg@janus.mylan
e9fb4a686f dbug/dbug.c: unused variable removed 
include/config-win.h: SIZEOF_INT
include/my_global.h: win64 fix
support-files/Makefile.am: automake magic
 2007-03-17 11:19:21 +01:00
serg@janus.mylan
5a5bcc741b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-03-17 09:12:26 +01:00
serg@janus.mylan
68fd66e853 wl#3700 - post-review fixes: 
s/ulonglong/key_part_map/, comments
 2007-03-17 00:13:25 +01:00
evgen@moonbone.local
cb89159eb1 sql_insert.cc: 
Post-merge fix.
 2007-03-16 23:10:12 +03:00
serg@janus.mylan
55a548cf4d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-03-16 20:33:27 +01:00
evgen@moonbone.local
409dd25e36 Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-03-16 22:20:24 +03:00
serg@janus.mylan
11fbf30e75 remove unnecessary line 2007-03-16 19:44:00 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
5233a2a52a merging 2007-03-16 22:23:37 +04:00
holyfoot/hf@hfmain.(none)
cc9fe9c3e1 Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-16 22:09:10 +04:00
omer@linux.site
23c4bc92f1 Modifications to Makefile.am to include new test options 
- for including qa developed suites
 - for options to run 'fast' tests
 2007-03-16 09:21:25 -07:00
omer@linux.site
469fffc47f Merge linux.site:/home/omer/source/bld50_0314 
into  linux.site:/home/omer/source/bld51_0314
 2007-03-16 09:03:02 -07:00
evgen@moonbone.local
e84584e2e3 Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY 
UPDATE if the row wasn't actually changed.

This bug was caused by fix for bug#19978. It causes AFTER UPDATE triggers
not firing if a row wasn't actually changed by the update part of the
INSERT .. ON DUPLICATE KEY UPDATE.

Now triggers are always fired if a row is touched by the INSERT ... ON
DUPLICATE KEY UPDATE.
 2007-03-16 17:23:26 +03:00
serg@janus.mylan
f813272125 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-03-16 14:09:30 +01:00
gkodinov/kgeorge@magare.gmz
830c134e84 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26261-5.0-opt
 2007-03-16 10:50:33 +02:00
gkodinov/kgeorge@macbook.gmz
61d93679c3 Bug #26261: 
INSERT uses query_id to verify what fields are
 mentioned in the fields list of the INSERT command.
 However the check for that is made after the 
 ON DUPLICATE KEY is processed. This causes all
 the fields mentioned in ON DUPLICATE KEY to be 
 considered as mentioned in the fields list of 
 INSERT.
 Moved the check up, right after processing the
 fields list.
 2007-03-16 10:35:39 +02:00
gluh@mysql.com/eagle.(none)
3912ce7f33 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-03-16 12:16:15 +04:00
gluh@mysql.com/eagle.(none)
ec4f730ba7 Bug#26285 selecting information_schema crahes server 
The crash happens when 'skip-grant-tables' is enabled.
We skip the filling of I_S privilege tables 
if acl_cache is not initialized.
 2007-03-16 12:15:51 +04:00
holyfoot/hf@hfmain.(none)
d6c997e968 Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-16 12:07:29 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
1e01c70351 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-16 12:06:36 +04:00
holyfoot/hf@hfmain.(none)
4c122a033a Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-16 12:05:55 +04:00
holyfoot/hf@hfmain.(none)
6b0567513f Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-16 11:56:29 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
5cb3d4f173 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-16 11:55:16 +04:00
holyfoot/hf@hfmain.(none)
1d0b7020b3 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-16 11:54:36 +04:00
joerg@trift2.
4042389179 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M51/mysql-5.1
 2007-03-15 22:34:35 +01:00
svoj@april.(none)
0360086836 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/bk/mysql-5.1-engines
 2007-03-16 01:34:33 +04:00
df@pippilotta.erinye.com
99a785c5aa 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-03-15 22:28:33 +01:00
omer@linux.site
c099df4b70 Added test options to Makefile.am including 
- test suites developed by QA 
 - additional 'fast' test options
 2007-03-15 14:28:32 -07:00
jbruehe/mysqldev@mysql.com/production.mysql.com
6d99387502 Raise version number after cloning 5.0.38 2007-03-15 22:28:31 +01:00
svoj@mysql.com/april.(none)
8b325697dd Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
 2007-03-16 01:28:29 +04:00
evgen@moonbone.local
fc8366e0e3 Merge moonbone.local:/mnt/gentoo64/work/27033-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-03-16 00:15:16 +03:00
evgen@moonbone.local
3d0df38f49 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27033-bug-5.0-opt-mysql
 2007-03-15 23:56:21 +03:00
evgen@moonbone.local
92c8558224 Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were 
touched but not actually changed.

The LAST_INSERT_ID() is reset to 0 if no rows were inserted or changed.
This is the case when an INSERT ... ON DUPLICATE KEY UPDATE updates a row
with the same values as the row contains.

Now the LAST_INSERT_ID() values is reset to 0 only if there were no rows
successfully inserted or touched.
The new 'touched' field is added to the COPY_INFO structure. It holds the
number of rows that were touched no matter whether they were actually
changed or not.
 2007-03-15 23:21:29 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
6640efd5f3 merging 2007-03-15 17:35:31 +04:00
holyfoot/hf@hfmain.(none)
ac92535baf Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-15 16:27:59 +04:00
holyfoot/hf@hfmain.(none)
1f77f3dbcb Merge mysql.com:/home/hf/work/26833/my51-26833 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-15 16:27:12 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
2e3ce3c20f Merge mysql.com:/home/hf/work/26833/my50-26833 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-15 16:26:37 +04:00
holyfoot/hf@hfmain.(none)
fd3f63a56a Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-15 16:24:12 +04:00
holyfoot/hf@hfmain.(none)
3acb519fa7 Merge mysql.com:/home/hf/work/26538/my51-26538 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-15 16:23:26 +04:00