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

16827 commits

Author SHA1 Message Date
iggy@recycle.(none)
4f498dec3a Merge recycle.(none):/src/bug23491/my50-bug23491 
into  recycle.(none):/src/bug23491/my51-bug23491
 2007-03-29 10:42:03 -04:00
iggy@recycle.(none)
bbc38df090 Bug#23491 MySQLDump prefix function call in a view by database name 
- mysqldump executes a SHOW CREATE VIEW statement to generate the text
that it outputs.  When the function name is retrieved it's database 
name is unconditionally prepended.  This change causes the function's 
database name to be prepended only when it was used to define the 
function.
 2007-03-27 12:31:44 -04:00
iggy@recycle.(none)
762eae0bf1 Merge recycle.(none):/src/bug27144/my50-bug27144 
into  recycle.(none):/src/bug27144/my51-bug27144
 2007-03-21 14:01:39 -04:00
iggy@recycle.(none)
a763917a6f Bug#27144 sp-destruct.test is disabled on Windows 
- Update test to run properly on Windows.
 2007-03-21 13:58:11 -04:00
msvensson@pilot.blaudden
a0c2fae01f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-21 14:34:25 +01:00
msvensson@pilot.blaudden
31b2f339a0 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-21 14:30:47 +01:00
msvensson@pilot.blaudden
7c5df4d35b Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-21 14:24:50 +01:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
79216dad87 Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build 
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
 2007-03-21 13:16:03 +02:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
ac1c81ddcf Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb 
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
 2007-03-21 13:14:12 +02:00
holyfoot/abotchkov@mysql.com/bk-internal.mysql.com
9d4a0118d8 mysqlbinlog-cp932.test: 
merging
 2007-03-21 09:28:26 +01:00
tsmith@quadxeon.mysql.com
9167aabaa3 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:27:45 +01:00
joerg@trift2.
d21bf44517 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/test-help-5.1
 2007-03-20 21:23:23 +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
joerg@trift2.
16ec3cb361 Merge trift2.:/MySQL/M50/test-help-5.0 
into  trift2.:/MySQL/M51/test-help-5.1
 2007-03-20 21:05:57 +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
joerg@trift2.
602ed0a945 Merge trift2.:/MySQL/M41/test-help-4.1 
into  trift2.:/MySQL/M50/test-help-5.0
 2007-03-20 19:52:40 +01:00
joerg@trift2.
69a2dcda37 Test "help": 
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.
 2007-03-20 19:36:11 +01:00
joerg@trift2.
54dd7a5112 Merge trift2.:/MySQL/M41/test-help-4.1 
into  trift2.:/MySQL/M50/test-help-5.0
 2007-03-20 19:29:46 +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
joerg@trift2.
86483de2e5 Test "help": 
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.
 2007-03-20 19:19:17 +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
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
holyfoot/hf@mysql.com/hfmain.(none)
0233b13572 tests fixed to work in embedded server 2007-03-20 17:53:55 +04: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
msvensson@pilot.blaudden
3dbc0f7852 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-20 11:23:17 +01:00
msvensson@pilot.blaudden
80fb08310e Bug#27070 server logs are created unrequested and in wrong directory 
- Avoid defaault log file names looking like <hostname>.pid.slow.log
  by using the FN_REPLACE_EXT flag to 'fn_format'
 - Remove the default log files generated by log_state.test before
   test completes
 2007-03-20 11:21:27 +01:00
msvensson@pilot.blaudden
d640af1881 Update test reulst after setting logging to be sent both to file and tables 2007-03-20 11:17:07 +01:00
msvensson@pilot.blaudden
68df4cbc5a Bug#27070 server logs are created unrequested and in wrong directory 
- Setting up a A->B->A replication causes relay logs being written
  by the master, remove them when test is finished
 2007-03-20 11:15:15 +01:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
7c22049dfa Bug #26079 max_binlog_size + innodb = not make new binlog and hang server 
There was hanging at binlog_commit by a thread executing autocommit query.

The hang appeared to be due to an overly condtion for early return 
from binlog_commit introduced by bug#20265 fix.

Fixed with reverting the logic back to 5.0 version.
 2007-03-20 10:50:10 +02: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
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
msvensson@pilot.blaudden
709f066948 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-19 11:15:59 +01:00
msvensson@pilot.blaudden
5463575a4c Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-19 09:26:07 +01:00
joerg@trift2.
90aa17c23b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-03-17 19:25:07 +01: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
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
joerg@trift2.
08a63f8afa Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M51/merge-5.1
 2007-03-16 20:04:32 +01:00
joerg@trift2.
3b4175fc2e Fix bug#27212, test case "loaddata": Take the file to read from the binary package. 2007-03-16 19:56:16 +01: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
msvensson@pilot.blaudden
88b4c86e09 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
 2007-03-16 17:28:32 +01: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 #23775 "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