Commit graph

13592 commits

Author SHA1 Message Date
aivanov/alexi@mysql.com/mysqld.localdomain
9a87889482 WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
tables to INFORMATION_SCHEMA.
2006-09-14 03:37:40 +04:00
guilhem@gbichot3.local
a8836b7dde Fixing problems I identified in my auto_increment work pushed in July
(as part of the auto_increment cleanup of WL#3146; let's not be
sad, that monster push still removed serious bugs):
one problem with INSERT DELAYED (unexpected interval releases),
one with stored functions (wrong auto_inc binlogging).
These bugs were not released.
2006-09-12 15:42:13 +02:00
lars/lthalmann@dl145k.mysql.com
a1c70022f2 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-11 17:14:40 +02:00
lars/lthalmann@dl145j.mysql.com
1dfc84986e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-11 13:34:44 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
4c467cc438 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-11 13:17:51 +02:00
guilhem@gbichot3.local
87de41ad23 Removing sleeps; rpl_row_basic_8partition falls from 2 minutes
15 seconds to less than a second.
The sleeps used to be necessary but not anymore as NDB has been fixed
wrt sync_slave_with_master.
2006-09-07 18:01:42 +02:00
mats@romeo.(none)
eea3e3d6b1 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/b17620-mysql-5.1-new-rpl
2006-09-06 19:34:02 +02:00
mats@romeo.(none)
6ba388d17c BUG#17620: Row-based replication fails when query cache enabled on slave
Invalidating query cache when processing rows for a statement on the slave.
2006-09-06 17:45:27 +02:00
jonas@perch.ndb.mysql.com
e51935b363 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-09-06 02:16:36 +02:00
mats@romeo.(none)
85548a8d86 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-09-04 14:58:34 +02:00
jonas@perch.ndb.mysql.com
81f9676de6 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-09-03 17:55:01 +02:00
anozdrin/alik@alik.
faad252336 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-tree
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-09-01 22:24:51 +04:00
mskold/marty@linux.site
712f1f3da4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 16:16:49 +02:00
mskold/marty@mysql.com/linux.site
166580275c Removed absolute path 2006-09-01 16:14:59 +02:00
mskold/marty@linux.site
04a62eb684 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 15:26:03 +02:00
mskold/marty@mysql.com/linux.site
8fdc781d39 Fixed ndbapi-examples, and added tests for mysql-test-run.pl 2006-09-01 15:14:50 +02:00
evgen@moonbone.local
e1c245bff3 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt
into  moonbone.local:/work/tmp_merge-5.1-mysql
2006-09-01 14:08:38 +04:00
mikael/pappa@dator5.(none)
636d902305 Removed Windows from tests since bug#19107 is known to hang test 2006-09-01 02:12:30 -04:00
mikael/pappa@dator5.(none)
35304be521 Merge dator5.(none):/home/pappa/clean-mysql-5.1-new-ndb
into  dator5.(none):/home/pappa/push_clone
2006-08-31 16:45:46 -04:00
anozdrin/alik@alik.
5d8598a405 Fix im_instance_conf.imtest failure on AIX and HPUX.
The problem was in dummy grep on AIX and HPUX.

The fix is to use more portable patterns.

The patch is only for test suite
(i.e. does not touch server codebase).
2006-08-31 18:48:50 +04:00
jonas@perch.ndb.mysql.com
7fc7ef51e1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
2006-08-31 11:02:12 +02:00
mikael/pappa@dator5.(none)
5109531b61 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into  dator5.(none):/home/pappa/push_clone
2006-08-31 04:56:09 -04:00
mikael/pappa@dator5.(none)
ba792224c4 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/push_clone
2006-08-31 04:49:34 -04:00
gluh@mysql.com/gluh.(none)
acaef19c61 Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..."
fixed error message
2006-08-31 13:43:26 +05:00
mikael/pappa@dator5.(none)
67ca3ba522 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into  dator5.(none):/home/pappa/bug21388
2006-08-31 04:26:14 -04:00
mikael/pappa@dator5.(none)
8c5db16fc5 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug21388
2006-08-31 04:21:14 -04:00
evgen@moonbone.local
94028c618f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-31 12:14:27 +04:00
kostja@bodhi.local
7290fa2fb7 Post-merge fixes. 2006-08-30 23:09:47 +04:00
aelkin/elkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi
ebaaee05e1 WL#3368 mixed format as default
Two minor fixes:
 1. to make make test executes with mixed;
 2. proper isolation of binlog_statement_insert_delayed 
    from others through reset master cleaning up binlog
    todo: adapt this technique to other restarting for binlog tests
2006-08-30 21:43:05 +03:00
evgen@moonbone.local
fe18e36e73 sql_base.cc, ndb_condition_pushdown.result, opt_range.cc:
After merge changes
2006-08-30 22:11:23 +04:00
Reggie@blackhole.
3d5fe499f0 disabled some tests to get passing tests 2006-08-30 11:16:53 -05:00
aelkin/elkin@andrepl.dsl.inet.fi
7be4bc4e55 Changes made according to HLD/LLD.
The following is an excerption from the WL.
      
   1. Change so that MIXED is default format
      1.1 to change the default for command line --binlog-format
      1.2 to alter global_system_variables.binlog_format calculation
          basing on command line --binlog-format parameter and 
          its default.
   2. Change test suite so that more testing is done by MIXED format.
      2.1 to check if there are test cases requiring --binlog-foramt=statement via
          `source include/have_binlog_format_statement.inc' and affected by 
          altering the latter to be "mixed".
      2.2 to check the content of such vulnerable cases to find if
          extending to the mixed does not modify results. In that case simply
          substitute source arguments as explained.
      2.3 if a test in mixed mode deals with features triggering
          row-binlogging then if necessary we can switch explicitly
          to statement mode or create another test to run with 
          non-recommended STATEMENT mode
   
          Particullarily, extracting INSERT DELAYED 
          binlogging subtest for statement mode is performed, and 
          the snippet is moved into a separate test file.
          Note that since now all three modes verify this use case
          through 3 different tests.
   
   No changes in item 3 of HLD appeared to be needed.
2006-08-30 10:22:43 +03:00
kostja@bodhi.local
ebb7070430 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-30 03:00:19 +04:00
jonas@perch.ndb.mysql.com
365b69dc7f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 22:56:23 +02:00
kostja@bodhi.local
3bf609b7f2 A fix for Bug#14897 "ResultSet.getString("table.column") sometimes
doesn't find the column"

When a user was using 4.1 tables with VARCHAR column and 5.0 server
and a query that used a temporary table to resolve itself, the
table metadata for the varchar column sent to client was incorrect:
MYSQL_FIELD::table member was empty.

The bug was caused by implicit "upgrade" from old VARCHAR to new
VARCHAR hard-coded in Field::new_field, which did not preserve
the information about the original table. Thus, the field metadata
of the "upgraded" field pointed to an auxiliary temporary table
created for query execution.

The fix is to copy the pointer to the original table to the new field.
2006-08-30 00:38:58 +04:00
evgen@moonbone.local
8cf9781717 Merge moonbone.local:/work/tmp_merge-5.0-mysql
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-29 18:58:50 +04:00
timour/timka@lamia.home
0368914b9a Merge lamia.home:/home/timka/mysql/src/5.0-bug-21456
into  lamia.home:/home/timka/mysql/src/5.1-bug-21456
2006-08-29 16:39:09 +03:00
kroki/tomash@moonlight.intranet
cb4ea78cbd Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
2006-08-29 16:24:00 +04:00
anozdrin/alik@alik.
1a7cb4153c Preliminary patch for the following bugs:
- BUG#15934: Instance manager fails to work;
  - BUG#18020: IM connect problem;
  - BUG#18027: IM: Server_ID differs;
  - BUG#18033: IM: Server_ID not reported;
  - BUG#21331: Instance Manager: Connect problems in tests;

The only test suite has been changed
(server codebase has not been modified).
2006-08-29 15:46:40 +04:00
kroki/tomash@moonlight.intranet
b9fef61616 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
2006-08-29 14:37:52 +04:00
kroki/tomash@moonlight.intranet
f8f1dd3e87 BUG#17591: Updatable view not possible with trigger or stored function
When a view was used inside a trigger or a function, lock type for
tables used in a view was always set to READ (thus making the view
non-updatable), even if we were trying to update the view.

The solution is to set lock type properly.
2006-08-29 14:32:59 +04:00
jonas@perch.ndb.mysql.com
7357e431a3 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 10:49:05 +02:00
jonas@perch.ndb.mysql.com
3cb9b16e0d ndb -
Add order by in rpl_(ndb)_multi_update3 to make result deterministic
2006-08-29 10:47:28 +02:00
evgen@moonbone.local
002af6b5ea Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-27 00:49:25 +04:00
evgen@moonbone.local
bafd6d5065 Merge moonbone.local:/work/tmp_merge-5.0-opt-mysql
into  moonbone.local:/work/tmp_merge-5.0-mysql
2006-08-26 22:17:34 +04:00
mikael/pappa@dator5.(none)
cb77c9b721 Enabled partition test again 2006-08-26 10:40:58 -04:00
mikael/pappa@dator5.(none)
b28a550eb4 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into  dator5.(none):/home/pappa/bug21388
2006-08-26 06:14:05 -04:00
andrey@example.com
f115ecf89f Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains
erroneous check

Problem: Actually there were two problems in the server code. The check
for SQLCOM_FLUSH in SF/Triggers were not according to the existing
architecture which uses sp_get_flags_for_command() from sp_head.cc .
This function was also missing a check for SQLCOM_FLUSH which has a
problem combined with prelocking. This changeset fixes both of these
deficiencies as well as the erroneous check in
sp_head::is_not_allowed_in_function() which was a copy&paste error.
2006-08-25 15:51:29 +02:00
sergefp@mysql.com
46480b22d2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/psergey/mysql-5.0-bug16255-merge
2006-08-25 14:44:28 +04:00
jonas@perch.ndb.mysql.com
e4c3a58134 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-25 11:59:28 +02:00