Commit graph

13634 commits

Author SHA1 Message Date
pekka@mysql.com
4312a79132 Bitmask.hpp:
compile fix for gcc-3.4.x
2004-07-31 15:53:27 +02:00
mskold@mysql.com
268c1a2edc Bug fix for alter table and auto_increment 2004-07-31 12:00:12 +02:00
serg@serg.mylan
4665cec001 bug#4817 catalog name is "def" 2004-07-30 22:15:52 +02:00
serg@serg.mylan
2852862c68 apply in SET PASSWORD same checks as in GRANT, to let only valid hashes through 2004-07-30 22:05:08 +02:00
marko@hundin.mysql.fi
08196b80b8 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/l/mysql-4.1
2004-07-30 17:32:53 +03:00
mronstrom@mysql.com
d6c380f9aa Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1
2004-07-30 16:10:08 +02:00
marko@hundin.mysql.fi
b435b8d47e fil0fil.c:
Restore accidentally deleted comment of fil_create_directory_for_tablename()
2004-07-30 17:04:56 +03:00
marko@hundin.mysql.fi
9edc3d8b9d ha_innodb.cc:
ha_innobase::create(): pass the query string as UTF-8
  to row_table_add_foreign_constraints()  (Bug #4649)
2004-07-30 16:08:19 +03:00
mronstrom@mysql.com
48c88f3a4b Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1
2004-07-30 15:05:56 +02:00
serg@serg.mylan
f66b4a1be4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-30 14:25:18 +02:00
serg@serg.mylan
c5e2fbcc53 no_auto_value_on_zero + alter table bug 2004-07-30 14:17:12 +02:00
lenz@mysql.com
2cef6b922b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-07-30 14:03:16 +02:00
lenz@mysql.com
453a079feb - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link
flags to enable static linking (to avoid having a shared lib
   dependency in the Linux RPMs)
 - Disabled OpenSSL in the Max RPM
2004-07-30 13:52:44 +02:00
jan@hundin.mysql.fi
e455748334 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-30 14:11:56 +03:00
mronstrom@mysql.com
69485c7bd3 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1
2004-07-30 12:48:34 +02:00
mronstrom@mysql.com
2973728a55 Removed an error check from debug mode that gets executed
n**2 times in closeTransaction where n is number of signals
sent in transaction. n can easily become 250.000 in a large
transaction.
2004-07-30 12:46:27 +02:00
pem@mysql.comhem.se
f0cd209373 Updated ps_6bdb.results. 2004-07-30 12:13:40 +02:00
serg@serg.mylan
97238e18bc Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-30 11:48:56 +02:00
guilhem@mysql.com
6c62aab7ac Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-07-30 10:12:02 +02:00
guilhem@mysql.com
80e74c80aa syntax fix: superfluous ';' which caused a problem with gcc 2.95 2004-07-30 10:08:37 +02:00
serg@serg.mylan
9bbdb794f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-30 09:50:37 +02:00
serg@serg.mylan
3a17ab4551 auto_value_on_zero bug test 2004-07-30 09:47:56 +02:00
dlenev@brandersnatch.localdomain
789037d901 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4492
2004-07-30 11:01:29 +04:00
jan@hundin.mysql.fi
b79d01d494 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-30 08:28:04 +03:00
guilhem@mysql.com
3262c28710 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-07-30 01:12:28 +02:00
guilhem@mysql.com
da55194eb4 rpl_relayrotate.test requires InnoDB (because what we want to test is
if slave resumes at BEGIN).
2004-07-30 01:10:21 +02:00
miguel@hegel.txg
a2869bc9ea Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.txg:/home/miguel/bk/mysql-4.1
2004-07-29 18:37:18 -03:00
miguel@hegel.txg
7a00a99583 Fix for bug report #4737 and revert fix for bug #4375 (re-opened). 2004-07-29 18:35:54 -03:00
guilhem@mysql.com
2b6151c20f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-07-29 23:28:28 +02:00
guilhem@mysql.com
0f3e279a05 WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).
2004-07-29 23:25:58 +02:00
pem@mysql.comhem.se
387a01ddc8 Added --with-ndbcluster config option to compile-pentium-valgrind-max
(since it's in the other -max builds already).
2004-07-29 15:28:40 +02:00
ingo@mysql.com
ec65f2b5a4 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-07-29 13:15:25 +02:00
pekka@mysql.com
8bd205c8e2 ha_ndbcluster.h, ha_ndbcluster.cc:
compile fix for gcc-2.95
2004-07-29 10:44:53 +02:00
ingo@mysql.com
fd1fad4371 Fixed a copy-and-paste error: mysql_create_frm() should have
its own enter string.
2004-07-29 10:33:33 +02:00
jan@hundin.mysql.fi
9d615368ac Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-29 09:04:50 +03:00
paul@kite-hub.kitebird.com
88f6267b63 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-07-28 14:52:31 -05:00
paul@kite-hub.kitebird.com
a3091294b4 Fix some variable misorderings. 2004-07-28 14:52:04 -05:00
ingo@mysql.com
a34ae3c573 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-07-28 21:47:51 +02:00
ingo@mysql.com
e25126c68a Casted all macro arguments,
used a common style with array subscripts,
improved the line-up, wrapped long lines.
2004-07-28 21:46:22 +02:00
pekka@mysql.com
7874177651 DbtuxScan.cpp:
fix erronous assert at scan close, lock abort
2004-07-28 19:54:38 +02:00
konstantin@mysql.com
7eddfc8e9a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-07-28 10:02:38 -07:00
pekka@mysql.com
b2b5e8715d MgmtSrvr.hpp:
make subclass friend for gcc-2.95 et al [dup push]
2004-07-28 18:55:17 +02:00
konstantin@mysql.com
22b3e25a91 Fixing MYSQL_CHEKC_ZLIB_DIR to take into account user settings (in case there
are such)
2004-07-28 09:34:06 -07:00
pekka@mysql.com
9ef1f2f172 MgmtSrvr.hpp:
make subclass friend for gcc-2.95 et al
2004-07-28 15:35:02 +02:00
pekka@mysql.com
aa9c8e9ebf Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-07-28 12:53:23 +02:00
joreland@mysql.com
2db2235512 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-28 11:05:27 +02:00
joreland@mysql.com
bac5d8f9b6 Fix 64-bit issue in ConfigValues 2004-07-28 11:05:00 +02:00
magnus@neptunus.(none)
10583f05c9 Added order by to make the test output from ndb_basic and ndb_lock predicatble 2004-07-28 10:28:30 +02:00
dlenev@brandersnatch.localdomain
d39fe2623f Fix for bug #4492.
TIMESTAMP columns should be unsigned to preserve compatibility with 4.0
(Or else InnoDB will return different internal TIMESTAMP values when user upgrades to 4.1).

Altough this fix will introduce problems with early 4.1 -> 4.1 upgrades (tables with 
TIMESTAMP field should be reloaded using mysqldump) it will allow easy 4.0 -> 4.1 
upgrade (which is more important since 4.1 is still beta).
2004-07-28 10:49:21 +04:00
jan@hundin.mysql.fi
8be6dd7d70 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-28 09:00:59 +03:00