Commit graph

37742 commits

Author SHA1 Message Date
mats@romeo.(none)
0d019e0380 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
2006-09-19 13:47:15 +02:00
mats@romeo.(none)
78ad0eee91 Fixing and checking result for mysqldump test. 2006-09-18 21:09:48 +02:00
mats@romeo.(none)
604aa87ebb Adding tests lost in the merge. 2006-09-18 10:08:10 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
1963d68a08 Test case fixes 2006-09-16 13:20:06 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b537b46255 modifying disabled file so it is a copy of main tree 2006-09-15 18:24:12 +02:00
aelkin@dl145h.mysql.com
acca475a9c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dl145h.mysql.com:/tmp/andrei/5.1-rpl
2006-09-15 17:04:14 +02:00
aelkin@dl145h.mysql.com
cb7dbdea71 bug#19259 rpl_ndb_dd_partitions fails because of limitation
re-activating the bug to fix related to the limitation tests.
2006-09-15 17:00:35 +02:00
aelkin/elkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi
cb2fa1d715 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dsl-hkigw8-fe00f800-98.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2006-09-15 17:55:05 +03:00
aelkin/elkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi
6055e8a9f7 Bug#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage
A query SET @@GLOBAL.binlog_format = ... returns an error when NDB is the
default storage. This fails some tests invoking the set binlog_format explicitly.
because the var turns to be read-only.
  
  In the following are files and method to fix if needed.
  
  t/
  ndb_binlog_basic2.test         # here the failure is benign
  rpl_rbr_to_sbr.test            # does not check any ndb features =>           
 
  .                              # => not_ndb_default is enough
  rpl_row_basic_8partition.test  # set binlog_format can be replaced
  rpl_switch_stm_row_mixed.test  # does not check any ndb features =>
  .                              # => not_ndb_default is enough
  
  two more invoking invoke extra/rpl_truncate_helper.test
  
  rpl_truncate_2myisam           # to be fixed with not_ndb_default
  rpl_truncate_3innodb           # same as above
  .                              # because there is a dedicated to ndb .        
 
  .                              # rpl_truncate_7ndb* suit.

Adapting/testing a new implement
--source include/safe_set_to_maybe_ro_var.inc
to avoid abort due to the error using binlog_format as application.
2006-09-15 17:25:13 +03:00
guilhem@gbichot3.local
09c5a83416 WL#3504 "plugin actions for engines' and plugins' unit tests"
for push in 5.1 (I will inform Trudy).
Storage engines and plugins can now have unit tests to test their components; such
test must be an executable C/C++ program which name ends with '-t' and which is
obeys the mytap protocol, it must be stored in the storage engine's or plugin's
source directory (storage/<engine> or plugin/<plugin>) or any subdirectories of
this.
The top-level Makefile target "test-unit" will run all unit tests: it will scan
the engines' and plugins' directories, recursively, and execute all executable
files which name ends with '-t'."
2006-09-15 15:15:24 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
996b8d92c7 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-15 03:52:36 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
a55fbb60b9 Merge main->rpl 2006-09-15 03:15:06 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
dd410b3f77 Merge fixes, added printout to result file 2006-09-15 03:02:01 +02:00
lars/lthalmann@dl145j.mysql.com
a3adcfe52d Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-15 01:46:47 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2840596e10 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-15 01:26:28 +02:00
guilhem@gbichot3.local
cd08de06b6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-clean
2006-09-14 03:35:51 +02:00
aivanov/alexi@mysql.com/mysqld.localdomain
9474d3fe44 WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
tables to INFORMATION_SCHEMA.
2006-09-14 05:35:50 +04:00
guilhem@gbichot3.local
7e95cda2ac fixes for the my_atomic-t unit test:
- compiler warning
- detection of pthread_create failure (you will see this message
only if you run with "make test-verbose" in unittest; otherwise
unit.pl masks all messages from the test but "ok" ones.
- the test fails randomly on some machines (I filed it as BUG#22320),
on one host it looks like a crash at exit() which a sleep(2) makes
disappear. So I add the sleep(2), which can be removed
when BUG#22320 is fixed.
2006-09-14 01:37:41 +02:00
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
mats@romeo.(none)
ca50d070a0 WL#3259 (RBR with more columns on slave than master):
Incorporating changes from review.
Fixing one bug that surfaced.
2006-09-13 19:25:12 +02:00
timour/timka@lamia.home
fad645f23e Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm
into  lamia.home:/home/timka/mysql/src/5.1-dbg
2006-09-13 15:22:50 +03:00
tsmith@maint2.mysql.com
a1c4a48b7e Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg/g51
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51
2006-09-12 19:40:00 +02:00
timour/timka@lamia.home
38a450b44a Fix for BUG#21774: Column count doesn't match value count at row x
The cause of the bug was an incomplete fix for bug 18080.
The problem was that setup_tables() unconditionally reset the
name resolution context to its 'tables' argument, which pointed
to the first table of an SQL statement.

The bug fix limits resetting of the name resolution context in
setup_tables() only in the cases when the context was not set
by earlier parser/optimizer phases.
2006-09-12 17:50:24 +03:00
msvensson@neptunus.(none)
7b7e66763c Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work 2006-09-12 16:43:57 +02:00
msvensson@neptunus.(none)
f6ce081f6a Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-12 16:13:00 +02: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
msvensson@neptunus.(none)
5a6cee9e1c Merge neptunus.(none):/home/msvensson/mysql/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-12 15:38:02 +02:00
msvensson@neptunus.(none)
da9724c992 Merge neptunus.(none):/home/msvensson/mysql/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-12 15:34:55 +02:00
msvensson@neptunus.(none)
4ae7c5a429 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-12 14:49:41 +02:00
Kristofer.Pettersson@naruto.
53bb0bdcda Merge naruto.:C:/cpp/bug20789/my50-bug20789
into  naruto.:C:/cpp/mysql-5.1-maint
2006-09-12 14:34:01 +02:00
Kristofer.Pettersson@naruto.
323efcc0c1 Bug#20789 Merge Subtable Rename Causes Crash
- When an ALTER TABLE RENAME is performed on windows, the files are closed and their cached file 
   descriptors are marked invalid. Performing INSERT, UPDATE or SELECT on the associated merge
   table causes a server crash on windows. This patch adds a test for bad file descriptors when a 
   table attempts a lock. If a bad descriptor is found an error is thrown. An additional FLUSH TABLES
   will be necessary to further operate on the associated merge table.
2006-09-12 14:23:41 +02:00
rburnett@production.mysql.com
db89fb33aa log.cc:
Fixing failed merge
2006-09-12 04:46:41 +02:00
cmiller@maint1.mysql.com
9b18cae31b Change stolen from the -win tree.
More specifically, the scripts/Makefile isn't created and it doesn't
translate mysql_fix_privilege_tables ".sh" .  So, 
mysql-test/mysql-test-run.pl doesn't find the binary and substitutes 
/bin/false instead.  That obviously doesn't "fix" anything and the 
test fails because of it.
2006-09-12 03:39:58 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
388b4df74e manual merge 2006-09-11 19:45:09 +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
rburnett@bk-internal.mysql.com
cf1a0b3250 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-09-11 16:43:56 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
6ad198e997 Fix WARN_DEPRECATED for 5.0 (it is in 5.1 we should have the extra arguments) 2006-09-11 14:45:40 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2da55c05e2 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-11 13:50:41 +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
msvensson@shellback.(none)
a1810201f6 Use the mtr_file_exists function to detect if ndbapi_example is available 2006-09-11 12:15:04 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
8c64ce171a Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-11 11:25:55 +02:00
mats@romeo.(none)
f480cb0d67 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
2006-09-11 10:22:04 +02:00
mats@romeo.(none)
f513461030 WL#3259 (More columns on slave than on master):
Adding files to CMakeLists.txt
2006-09-11 10:19:11 +02:00
serg@janus.mylan
28b90bfab5 bugfix 2006-09-09 10:39:12 +02:00
serg@janus.mylan
62b5c384df Merge bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-arch
2006-09-09 10:27:12 +02:00
msvensson@shellback.(none)
d54cbe9120 "crash_commit_before" need innodb 2006-09-08 16:26:35 +02:00
msvensson@shellback.(none)
e03a0617a0 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-08 16:01:51 +02:00
msvensson@shellback.(none)
8ce37febef Fix problem running mysql-test-run.pl when running in a clone not compiled with ndb support 2006-09-08 15:55:11 +02:00
msvensson@shellback.(none)
5ac62fd1d6 Bug#21855 Compilation error in ha_innodb.cc
- Add ifdefs in ha_innodb.cc so it's only compiled if we have selected to build mysqld with innodb.
   This is inline with how it's done in other handlers.
2006-09-08 15:42:49 +02:00