Commit graph

32315 commits

Author SHA1 Message Date
unknown
2a60a43201 Updated test case. SHOW CREATE TABLE uses uppercase DEFAULT clause in 5.1. 2006-03-25 12:07:45 +03:00
unknown
9f9832e62d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16415
2006-03-25 01:12:06 +01:00
unknown
89822edbd5 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-24 15:24:06 -08:00
unknown
b16e72977d Merge mysql.com:/home/dlenev/mysql-5.0-bg18153
into  mysql.com:/home/dlenev/mysql-5.1-merges


sql/sql_table.cc:
  Manual merge.
2006-03-25 02:24:05 +03:00
unknown
b95fb17332 manual merge
mysql-test/r/events.result:
  Auto merged
mysql-test/t/events_bugs.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
2006-03-25 00:24:04 +01:00
unknown
8cf221f4bb changed version number 2006-03-24 18:24:04 -05:00
unknown
538cbbc444 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/dlenev/mysql-5.1-merges


sql/sql_table.cc:
  Auto merged
2006-03-25 02:24:04 +03:00
unknown
1a53c9c3a3 Redisabled partition_03ndb, hangs 2006-03-24 18:24:03 -05:00
unknown
e753ca0ba0 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-03-24 18:22:32 -05:00
unknown
d45ebd7aa2 BUG#16806: ALTER TABLE with new field in before position fails
Review fixes


sql/sql_partition.cc:
  Review fixes
sql/sql_table.cc:
  Review fixes
2006-03-24 18:21:43 -05:00
unknown
c1038471f5 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-03-24 17:34:12 -05:00
unknown
2a70440543 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-03-24 12:56:31 -08:00
unknown
a18307f582 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/join_outer.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
2006-03-24 12:46:33 -08:00
unknown
c0579144d5 Fixed bug #17164.
If the WHERE condition of a query contained an ORed FALSE term
then the set of tables whose rows cannot serve for null complements
in outer joins was determined incorrectly. It resulted in blocking 
possible conversions of outer joins into joins for such queries.


mysql-test/r/join_outer.result:
  Added a test case for bug #17164.
mysql-test/t/join_outer.test:
  Added a test case for bug #17164.
2006-03-24 12:44:54 -08:00
unknown
bb7e682809 Follow-up for the fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional
tables corrupt triggers".

It turned out that we also have relied at certain places that
(new_table != table_name) were always true on Windows and for transactional
tables. Since our fix for the bug brakes this assumption we have to add new
flag to pass this information around.
This code needs to be refactored but I dare not to do this in 5.0.


sql/sql_table.cc:
  mysql_alter_table():
    Follow-up for the fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on
    transactional tables corrupt triggers". It turned out that we also have
    relied at certain places that (new_table != table_name) were always true
    on Windows and for transactional tables. Since our fix for the bug brakes
    this assumption we have to add new flag to pass this information around.
    This code needs to be refactored but I dare not to do this in 5.0.
2006-03-24 22:46:33 +03:00
unknown
d29e9a204a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-24 18:52:31 +01:00
unknown
040397edec Merge mysql.com:/home/dlenev/mysql-5.0-bg18153
into  mysql.com:/home/dlenev/mysql-5.1-merges


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
2006-03-24 19:46:01 +03:00
unknown
c8e6cdda84 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
2006-03-24 17:46:00 +01:00
unknown
6e9cd55d83 fix for bug#16415 Events names are case sensitive
mysql-test/lib/init_db.sql:
  make name not binary, then event names won't be case sensitive
mysql-test/r/events.result:
  output fix
mysql-test/r/events_bugs.result:
  update result
mysql-test/t/events_bugs.test:
  test case for bug #16415 events' names are case sensitive
scripts/mysql_create_system_tables.sh:
  make name not binary, then event names won't be case sensitive
scripts/mysql_fix_privilege_tables.sql:
  make name not binary, then event names won't be case sensitive
2006-03-24 17:45:52 +01:00
unknown
3adaea9d53 disabled test referring to bug 2006-03-24 17:41:26 +01:00
unknown
084d6e19e5 Commented out lines in disabled.def that have bug numbers that are closed
mysql-test/t/disabled.def:
  Commented out tests in disabled.def that have bug numbers that are closed
2006-03-24 09:45:44 -05:00
unknown
98dfa6a1eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/mysql-5.0-bg18153
2006-03-24 16:46:37 +03:00
unknown
77a921691d Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


mysql-test/lib/mtr_timer.pl:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2006-03-24 14:21:45 +01:00
unknown
5d119bf62c Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-24 13:56:05 +01:00
unknown
11d1a6fc41 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 13:55:10 +01:00
unknown
9501550d5a Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 13:50:41 +01:00
unknown
0abaf88c89 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-24 13:31:51 +01:00
unknown
2c45951d8d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-03-24 13:28:29 +01:00
unknown
c62de1d5a8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/mysql-5.0-bg18153
2006-03-24 15:28:08 +03:00
unknown
84992f54b7 Enabled test rpl_ndb_insert_ignore 2006-03-24 13:26:35 +01:00
unknown
a389ec0b1b Fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional tables corrupt
triggers".

Applying ALTER/OPTIMIZE/REPAIR TABLE statements to transactional table or to
table of any type on Windows caused disappearance of its triggers.
Bug was introduced in 5.0.19 by my fix for bug #13525 "Rename table does not
keep info of triggers" (see comment for sql_table.cc for more info).
.


mysql-test/r/trigger.result:
  Added test-case covering handling of triggers when one does ALTER TABLE which
  should move table to different database.
mysql-test/t/trigger.test:
  Added test-case covering handling of triggers when one does ALTER TABLE which
  should move table to different database.
sql/sql_table.cc:
  mysql_alter_table():
    Removal of strdup() which is no longer necessary allows us to preserve
    nice assumption that "(new_db != db || new_table != table_name) indicates
    that table will be renamed. So now we really can use this condition to
    avoid updating trigger definitions when table is not renamed.
    Note that we can't use (alter_info->flags & ALTER_RENAME) condition instead
    since it can be also true when we do "ALTER TABLE t1 RENAME TO t1".
sql/sql_trigger.cc:
  Table_triggers_list::change_table_name():
    Mentioned assumption that subject table is not renamed to itself in method
    description. Added DBUG_ASSERT() to catch wrong usage of this method.
mysql-test/r/trigger-trans.result:
  New BitKeeper file ``mysql-test/r/trigger-trans.result''
mysql-test/t/trigger-trans.test:
  New BitKeeper file ``mysql-test/t/trigger-trans.test''
2006-03-24 14:58:18 +03:00
unknown
f9140bdf63 ndb autotest
fix \ in makefile (merge error)


storage/ndb/test/run-test/Makefile.am:
  fix makefile
2006-03-24 12:36:39 +01:00
unknown
e65c4d2297 Merge 192.168.0.100:mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
2006-03-24 12:33:11 +01:00
unknown
bd3cbbe544 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-24 12:25:03 +01:00
unknown
045d42e53f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 12:02:39 +01:00
unknown
9b5ce28914 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-24 11:59:11 +01:00
unknown
9d9ac1b000 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-24 11:59:10 +01:00
unknown
1469ff412a disabled.def:
enabled rpl_ndb_blob since a "hanging" bug was fixed


mysql-test/t/disabled.def:
  enabled rpl_ndb_blob since a "hanging" bug was fixed
2006-03-24 11:57:31 +01:00
unknown
f2e9a5cfa0 ndb - bug#18295
more work-arounds for gcc4


storage/ndb/src/kernel/vm/Pool.hpp:
  More gcc4 craziness
2006-03-24 11:35:57 +01:00
unknown
7c8acd5931 Fix 'metaphon' function to correctly calculate the length of the returned string
sql/udf_example.cc:
  Calculate length of returned string correctly
2006-03-24 11:12:32 +01:00
unknown
72470a9828 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-03-24 10:52:44 +01:00
unknown
7a86236dfd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
2006-03-24 10:48:28 +01:00
unknown
cebcd28232 If doing write, then peeking is not needed 2006-03-24 10:45:00 +01:00
unknown
4a3c103ad9 Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted' 2006-03-24 10:42:55 +01:00
unknown
655139c943 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-24 13:32:16 +04:00
unknown
bf3c1e18a0 ndb -
more compiler warnings...


storage/ndb/include/util/InputStream.hpp:
  more warnings
2006-03-24 10:23:50 +01:00
unknown
6c9618d18d ndb -
still some compiler warnings


storage/ndb/include/util/OutputStream.hpp:
  still some compiler warnings
storage/ndb/include/util/SimpleProperties.hpp:
  still some compiler warnings
storage/ndb/src/kernel/vm/Pool.hpp:
  still some compiler warnings
2006-03-24 10:19:10 +01:00
unknown
cb7aa5abdb Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-24 10:17:18 +01:00
unknown
d592337739 Merge ndbdev@ndbmaster.mysql.com:jonas/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-24 10:12:35 +01:00
unknown
c2e4ef092b - corrected bug causing hang in getTable when using blob tables
- make sure cluster/schema table is always created first


sql/ha_ndbcluster_binlog.cc:
  make sure cluster/schema table is always created first
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  corrected bug causing hang in getTable when using blob tables
2006-03-24 10:12:34 +01:00