Commit graph

21713 commits

Author SHA1 Message Date
serg@serg.mylan
d6062ef9b5 removed a reference to non-existing file 2005-04-05 16:39:40 +02:00
serg@serg.mylan
9275b11226 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-05 15:38:26 +02:00
serg@serg.mylan
7f2a12bbbf fix broken mix_innodb_myisam_binlog.test 2005-04-05 15:36:52 +02:00
serg@serg.mylan
71811298b9 sql/item.cc
after merge fix
sql/mysqld.cc
    too early for sync-binlog=1 by default :)
2005-04-05 14:46:18 +02:00
marko@hundin.mysql.fi
8d6427659f InnoDB: Disable an assertion that fails on old data due to Bug #9526 2005-04-05 15:13:14 +03:00
serg@serg.mylan
c796ea598c Merge 2005-04-05 13:23:11 +02:00
serg@serg.mylan
810b2c3d40 remove the rest of isam/merge references
fix a race condition in TC_LOG_BINLOG::unlog
2005-04-05 13:17:49 +02:00
gluh@eagle.intranet.mysql.r18.ru
6c8624f6d5 Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
restore original 'lex->query_tables' table list after
   processing of information schema table
   remove unnecessary operations
2005-04-05 16:09:56 +05:00
gluh@mysql.com
9dd3e180b9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/mysql-5.0
2005-04-05 15:13:07 +05:00
gluh@eagle.intranet.mysql.r18.ru
6c8c2d22b9 Fix for bug#7214: information_schema: unauthorized user can see metadata
the fix for 'columns' table only
    Rights check for 'routines' table is already done
    (see WL2131 Access control for SHOW ... PROCEDURE|FUNCTION ...)
    rename 'testtets' database to 'mysqltest' to keep number of
      DBs which created by mysql-test as small as possible
2005-04-05 15:12:15 +05:00
ramil@mysql.com
0ba6c67d13 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-05 14:42:18 +05:00
gluh@eagle.intranet.mysql.r18.ru
fed0ba272a Code optimization(discussed with Monty) 2005-04-05 14:31:46 +05:00
ramil@mysql.com
f57c7d8b11 Fix for bug #9571: Primary key creation causes server crash. 2005-04-05 13:40:34 +05:00
petr@mysql.com
8197710349 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-04-05 06:12:41 +04:00
jimw@mysql.com
c13464b813 Skip new test with embedded server 2005-04-04 17:08:12 -07:00
jimw@mysql.com
8adf572cca Fix merge of tests that were split out of other test files 2005-04-04 16:34:24 -07:00
jimw@mysql.com
2f0bb42d12 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-04 15:19:50 -07:00
jimw@mysql.com
eeacad63c1 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-04 15:19:49 -07:00
monty@mysql.com
48de1ff277 Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system) 2005-04-05 01:19:48 +03:00
monty@mysql.com
e726bbb3d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-05 00:33:35 +03:00
monty@mysql.com
1be0a0c82a Now one gets an error if one tries to insert an invalid value via a stored procedure in STRICT mode. (Bug #5907) 2005-04-05 00:32:48 +03:00
jimw@mysql.com
fc3c7d5f74 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 12:46:43 -07:00
jimw@mysql.com
c18307e8a2 Cleanup tests and results after merge from 4.1 of embedded
server testing cleanups.
2005-04-04 12:43:58 -07:00
heikki@hundin.mysql.fi
a226b4aff2 ha_innodb.cc, row0sel.c:
Fix Bug #9526 in 5.0: MySQL ENUM and SET columns are internally actually unsigned integer types; we must take care that old tables still treat ENUM and SET (incorrectly) as a character string, while new created tables treat it correctly as an unsigned integer
2005-04-04 20:31:04 +03:00
heikki@hundin.mysql.fi
0acec5fefc Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-04 19:47:26 +03:00
heikki@hundin.mysql.fi
73a8d1bcad ha_innodb.cc:
Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables
2005-04-04 19:41:52 +03:00
heikki@hundin.mysql.fi
63aa88638a ha_innodb.cc:
Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string
2005-04-04 19:27:28 +03:00
serg@sergbook.mylan
2b8ff6949f delete isam/merge files 2005-04-04 17:58:21 +02:00
jimw@mysql.com
c2cfa5e435 Merge 2005-04-04 08:54:36 -07:00
jimw@mysql.com
0f007e5c73 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 08:42:30 -07:00
monty@mysql.com
04f8e164fb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-04 16:45:23 +03:00
monty@mysql.com
5ba3f707f7 Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
Fix that mysql.proc works with new VARCHAR fields
Give warnings for wrong zero dates
2005-04-04 16:43:25 +03:00
bar@mysql.com
856378bdda Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
2005-04-04 18:04:29 +05:00
bar@mysql.com
d9f8b501db ctype_uca.result:
fixing test results accordingly.
ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.
2005-04-04 17:55:12 +05:00
ramil@mysql.com
ac2efb1300 Fix for bit type:
we have to handle bit fields as well.
2005-04-04 16:33:23 +05:00
gluh@eagle.intranet.mysql.r18.ru
f1773668a8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into eagle.intranet.mysql.r18.ru:/home/gluh/MySQL/Bugs/mysql-5.0.9344
2005-04-04 12:12:50 +05:00
petr@mysql.com
7730319738 Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
doesn't work out of the box)
2005-04-04 03:49:10 +04:00
serg@serg.mylan
52770e8682 XID SQL syntax
minor cleanups
XA tests
2005-04-04 00:50:05 +02:00
bell@sanja.is.com.ua
957c01ad14 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
2005-04-03 22:38:05 +03:00
dlenev@brandersnatch.localdomain
fc1e7b07d6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-trg3
2005-04-03 17:02:13 +04:00
bell@sanja.is.com.ua
51b17c974d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
2005-04-03 15:30:18 +03:00
dlenev@brandersnatch.localdomain
c67971af3c Bug #3891 - "DROP TABLE many-unexistent-tables, was printing an error with
%s instead of table names".

Propagating changes from old language-specific errmsg.txt files to new
global errmsg.txt.
2005-04-03 11:31:50 +04:00
dlenev@mysql.com
7b294bdc8d Merge of patch for bug #3891 into 5.0 tree. 2005-04-03 10:36:18 +04:00
dlenev@mysql.com
da53d7bc88 Manual merge of fix for bug #8894 "TIMESTAMP values scrambled/misaligned
when using --new" into 4.1 tree.
2005-04-03 10:05:01 +04:00
dlenev@mysql.com
a663889569 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg8894
2005-04-03 09:48:09 +04:00
bell@sanja.is.com.ua
e2a83fca56 - stackoverflow check added for view of view processing
- fixed bug in join view processing
- postreview fixes (BUG#9398 & BUG#8703)
2005-04-03 01:23:45 +03:00
serg@serg.mylan
ddee2fa7fb Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-02 21:45:02 +02:00
serg@serg.mylan
4a0e73c63a results updated 2005-04-02 21:36:50 +02:00
serg@serg.mylan
7ba99ee324 merged 2005-04-02 20:28:58 +02:00
serg@serg.mylan
3098b93ef8 bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)
2005-04-02 20:13:19 +02:00