Commit graph

21831 commits

Author SHA1 Message Date
marko@hundin.mysql.fi
f32fe9c154 InnoDB: Avoid test suite failures caused by a locking conflict
between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux.  (Bug #9381)
2005-04-06 15:09:15 +03:00
kent@mysql.com
34284d9354 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-04-06 13:45:14 +02:00
hf@deer.(none)
b552ed8fd3 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-06 15:51:24 +05:00
hf@deer.(none)
7cd0e43437 Stupid error message for 'insert "aaa"' into decimal column fixed 2005-04-06 15:49:55 +05:00
msvensson@neptunus.(none)
1e030d5d93 BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree
- Fixing obvious ones
2005-04-06 12:27:43 +02:00
kent@mysql.com
57d8914287 Makefile.am:
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed
2005-04-06 12:20:55 +02:00
gluh@mysql.com
85bf400612 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 15:19:02 +05:00
bar@mysql.com
1c46a02069 Minor clean-ups for the previous commit. 2005-04-06 15:12:44 +05:00
gluh@mysql.com
decfc86fbb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables 2005-04-06 14:13:06 +05:00
msvensson@neptunus.(none)
a47bc28876 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-06 10:56:02 +02:00
heikki@hundin.mysql.fi
0c2caeb4d8 row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h:
Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
2005-04-06 10:27:40 +03:00
bar@mysql.com
0134a2b286 Adding a new parameter for well_formed_length to
return error. We'll use it for better warnign reporting.
2005-04-06 11:53:15 +05:00
jimw@mysql.com
2f398fc3ae Update tests after merge of bug fix. 2005-04-05 20:55:06 -07:00
jimw@mysql.com
b95cb4e654 Merge 2005-04-05 19:45:34 -07:00
jani@ua141d10.elisa.omakaista.fi
08d51d05dc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-04-05 23:20:09 +03:00
jani@ua141d10.elisa.omakaista.fi
1dd12e9d04 Some of the argument place holders were not quite correct compared to
the argument type. Fixed also some float() casts to double() as query_id
is now actually longlong type. Related to Bug#9646.
2005-04-05 23:14:56 +03:00
jimw@mysql.com
127afff8c8 Remove references to result.es files 2005-04-05 13:01:42 -07:00
jimw@mysql.com
a12f66251b Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-05 12:37:23 -07:00
msvensson@neptunus.(none)
771133bc6c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-05 21:31:54 +02:00
msvensson@neptunus.(none)
9a3a9d037f Merge neptunus.(none):/home/msvensson/mysql/bug6762-1.2152.20.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5
2005-04-05 21:30:24 +02:00
serg@serg.mylan
014c8829cb Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-05 20:04:31 +02:00
serg@serg.mylan
ea673c1afd Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-05 19:52:22 +02:00
serg@serg.mylan
8790645b48 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-04-05 19:45:04 +02:00
serg@serg.mylan
4962ba7f8a merged 2005-04-05 19:44:39 +02:00
jimw@mysql.com
ebd9a56e3b Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-05 09:59:36 -07:00
serg@serg.mylan
42277bdd2f Per Heikki's request make trans_register_ha tolerant to multiple registrations 2005-04-05 18:42:34 +02:00
jimw@mysql.com
9ff854dd12 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-05 07:59:11 -07:00
heikki@hundin.mysql.fi
a3e6b30a89 handler.cc, ha_innodb.cc:
Fix Bug #8650 : InnoDB does not rollback SQL statement at an error
2005-04-05 17:56:40 +03:00
serg@serg.mylan
680f7d3b66 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-05 16:41:20 +02:00
serg@serg.mylan
d6062ef9b5 removed a reference to non-existing file 2005-04-05 16:39:40 +02:00
pem@mysql.com
3f7901c6ed Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-05 16:01:29 +02:00
mskold@mysql.com
f792eaf061 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-05 16:01:28 +02:00
mskold@mysql.com
5d35ca1127 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-05 15:57:50 +02:00
mskold@mysql.com
70482c4127 Fix Bug #9517 Condition pushdown to storage engine does not work for update/delete, post review fix, removed quick constraint 2005-04-05 15:56:43 +02:00
pem@mysql.comhem.se
b18ca48c47 Additional fix for BUG#5907: Traditional mode: invalid value can be inserted via a stored procedure
... make the handler catch too.
2005-04-05 15:49:10 +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
jimw@mysql.com
39cd93e867 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-05 06:36:16 -07:00
serg@serg.mylan
3c3defaa0a add changeset key to the bk commit mail 2005-04-05 15:16:15 +02:00
mskold@mysql.com
9189816e07 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-05 14:58:42 +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
pekka@mysql.com
114b421c8b ndb - csc#4847 release scan op early to save memory 2005-04-05 13:14:03 +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
jani@ua141d10.elisa.omakaista.fi
6ed11e3bb3 A fix for Netware. 2005-04-05 13:15:04 +03: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