mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-05 18:53:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44225 commits 2861 branches 349 tags 1.7 GiB
Commit graph

20103 commits

Author SHA1 Message Date
tsmith@quadxeon.mysql.com
af19690659 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:49:58 +01:00
tsmith@quadxeon.mysql.com
cc4ea8bba8 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-20 21:35:11 +01:00
tsmith@quadxeon.mysql.com
7018d9c5aa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:12:46 +01:00
tsmith@quadxeon.mysql.com
2250d1a752 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:05:48 +01:00
tsmith@quadxeon.mysql.com
2670f149d0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-20 20:59:41 +01:00
kent@mysql.com/kent-amd64.(none)
0e84886d61 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-20 19:23:20 +01:00
tsmith@quadxeon.mysql.com
21ed11cda2 Bug : Server crash when dumping into outfile with long FIELDS ENCLOSED BY option 
- Problem: data separators were copied to a fixed-size buffer
  on the stack; memcpy was used, without bounds checking; a
  server crash could result if long FIELDS ENCLOSED BY, etc.,
  was given
- Fix: write the separators directly, instead of copying to
  a buffer first (in select_export::send_data())
 2007-03-20 19:09:28 +01:00
kent@kent-amd64.(none)
a149769b2d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 17:58:30 +01:00
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
tomas@whalegate.ndb.mysql.com
7bd5241cb4 enabled test case 
+ some fixes to do the enable
 2007-03-20 17:07:53 +01:00
kaa@polly.local
41992a2729 Merge polly.local:/tmp/maint/bug23775/my50-bug23775 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-03-20 17:27:49 +03:00
kaa@polly.local
24052c23e1 Merge polly.local:/tmp/maint/bug23775/my51-bug23775 
into  polly.local:/tmp/maint/mysql-5.1-maint
 2007-03-20 15:48:25 +03:00
tsmith@quadxeon.mysql.com
f1b1eb030b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-20 09:00:38 +01:00
tsmith@quadxeon.mysql.com
9ff0553f7a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-20 08:57:55 +01:00
tomas@whalegate.ndb.mysql.com
c3993eceb4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-20 08:49:29 +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
tsmith@quadxeon.mysql.com
0eae26ef57 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-19 23:36:38 +01: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
tsmith@quadxeon.mysql.com
6252477a7b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-19 23:10:58 +01: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
joerg@trift2.
90879b5737 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-03-19 22:18:31 +01:00
df@pippilotta.erinye.com
eb0ddb2184 BUG#27270 Can't compile latest 5.1-main 2007-03-19 20:44:46 +01:00
tomas@whalegate.ndb.mysql.com
9b90dd9c9f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-19 12:31:33 +01:00
joerg@trift2.
e54ed17b2c Fix a failure in test "func_in" on some 64-bit big-endian hosts in first 5.0.38 builds. 2007-03-17 19:45:01 +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
joerg@trift2.
66960bd1e7 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Build sql files for netware from the mysql_system_tables*.sq files
 - Fix comments about mysql_create_system_tables.sh
 - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
 - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files

Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.
 2007-03-16 20:56:16 +01: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
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
kaa@polly.local
1bcaa94457 Merge polly.local:/tmp/maint/bug23775/my50-bug23775 
into  polly.local:/tmp/maint/bug23775/my51-bug23775
 2007-03-16 17:33:22 +03:00
kaa@polly.local
55be09c0ee Fix for bug "Replicated event larger that max_allowed_packet infinitely re-transmits". 
Problem: to handle a situation when the size of event on the master is greater than max_allowed_packet on slave, we checked for the wrong constant (ER_NET_PACKET_TOO_LARGE instead of CR_NET_PACKET_TOO_LARGE).

Solution: test for the client "packet too large" error code instead of the server one in slave I/O thread.
 2007-03-16 17:25:20 +03: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 : 
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@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@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
Justin.He/justin.he@dev3-240.dev.cn.tlan
8d40069c3c Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-merge
 2007-03-16 11:02:57 +08: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@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)
6767673750 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-15 16:22:32 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
21847d6890 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-15 16:21:43 +04:00