dlenev@mysql.com
4e52cc2ded
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6266
2004-11-19 21:51:37 +03:00
dlenev@mysql.com
aaee135243
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6439
2004-11-19 21:38:51 +03:00
dlenev@mysql.com
5627dddb93
Manual merge of fix for bug #6439 "from_unixtime() function returns
...
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.
2004-11-19 19:19:45 +03:00
dlenev@mysql.com
cb7e272e46
Manual merge of fix for bug #6266 "Invalid DATETIME value is not handled
...
properly" with main tree.
2004-11-19 18:35:36 +03:00
bar@mysql.com
770c9be8c2
Bug #6658 MAX(column) returns incorrect coercibility
...
Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.
2004-11-19 19:35:36 +04:00
dlenev@mysql.com
40083741ee
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
2004-11-19 17:54:14 +03:00
tomas@poseidon.ndb.mysql.com
fdfc731155
ha_ndbcluster.cc:
...
merge error
2004-11-19 09:27:16 +00:00
tomas@poseidon.ndb.mysql.com
2048819f7a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-19 09:18:36 +00:00
guilhem@mysql.com
6c438ba9a4
log_event.cc:
...
post-conflict-merge fix (duplicate comment)
2004-11-19 00:57:26 +01:00
tomas@poseidon.ndb.mysql.com
eb11d34403
moved ndb_use_transactions out of opts and to be set default true in THD::init
2004-11-18 22:45:48 +00:00
guilhem@mysql.com
631f6f3c30
Merge
2004-11-18 23:31:23 +01:00
guilhem@mysql.com
7743dbbb56
When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited
...
much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
command, so it is quite innocuous.
2004-11-18 22:59:17 +01:00
tomas@poseidon.ndb.mysql.com
2ec794a970
Merge
2004-11-18 21:54:53 +00:00
mskold@mysql.com
7bbee8c95d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-18 15:55:18 +01:00
mskold@mysql.com
a4d061a5d9
Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key ..
2004-11-18 12:11:56 +01:00
pekka@mysql.com
bc31325180
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-11-18 11:55:53 +01:00
guilhem@mysql.com
d34421c127
Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code.
...
Moving the part of user_var.test using UCS2 to ctype_ucs.test
2004-11-17 16:41:30 +01:00
tomas@poseidon.ndb.mysql.com
2c677ed687
Merge
2004-11-17 10:59:16 +00:00
tomas@poseidon.ndb.mysql.com
1700bf3844
Enabled usage of new system variables for ndb
...
- ndb_use_exact_count
- ndb_autoincrement_prefetch_sz
- ndb_use_transactions
- ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code
2004-11-17 08:15:53 +00:00
tomas@poseidon.ndb.mysql.com
0acc6f83b2
enabled having system tables in ndb
2004-11-17 08:10:26 +00:00
sergefp@mysql.com
bfd6c218b2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
2004-11-17 01:26:23 +03:00
heikki@hundin.mysql.fi
2b1117702e
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-11-16 22:50:29 +02:00
heikki@hundin.mysql.fi
b560503386
ha_innodb.cc:
...
Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this
2004-11-16 22:49:28 +02:00
konstantin@mysql.com
a38ac4b26d
Fix comment.
2004-11-16 23:27:31 +03:00
heikki@hundin.mysql.fi
ea59300d62
ha_innodb.cc:
...
Manually ported this bug fix from 4.0:
Fix InnoDB bug #6287 : if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
2004-11-16 20:45:52 +02:00
heikki@hundin.mysql.fi
dd64377dc2
ha_innodb.cc:
...
Fix InnoDB bug #6287 : if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
2004-11-16 20:37:42 +02:00
sergefp@mysql.com
1cc999fbd4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
2004-11-16 21:36:31 +03:00
tomas@poseidon.ndb.mysql.com
a69ddb033d
ha_ndbcluster.cc:
...
reverting previous patch
2004-11-16 13:56:25 +00:00
ram@gw.mysql.r18.ru
f0355a6737
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6449
2004-11-16 16:10:45 +04:00
tomas@poseidon.ndb.mysql.com
8ee2a1836e
Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user
2004-11-16 12:10:44 +00:00
ram@gw.mysql.r18.ru
dde88ea82b
A fix (bug #6449 : DO server-crashing bug).
2004-11-16 14:36:25 +04:00
bar@mysql.com
629f1bb616
Bug #6552 CHAR column w/o length is legal, BINARY w/o length is not
2004-11-16 12:05:13 +04:00
lars@mysql.com
b7cfe5ecad
BUG#6353 V2:
...
Replication using replicate-rewrite-db did not work for LOAD DATA INFILE.
Now is does. There was one place in the code that used current database
instead of the rewrite database.
2004-11-15 17:03:54 +01:00
dlenev@mysql.com
5ddc564d89
Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime
...
values for too big argument".
Added range checking for from_unixtime() argument, cleaned up code
a bit.
2004-11-15 16:11:13 +03:00
dlenev@brandersnatch.localdomain
b02f5aa692
Fix for bug #6266 "Invalid DATETIME value is not handled properly".
...
In server we assume that datetime values stored in MYSQL_TIME struct
are normalized (and year is not greater than 9999), so we should
perform range checks in all places then we convert something to
MYSQL_TIME.
2004-11-15 15:44:29 +03:00
bell@sanja.is.com.ua
9950ccd278
fixed incorrect using of THD::is_fatal_error
2004-11-14 10:25:38 +02:00
pekka@mysql.com
52e05dadac
ndb: fix bug-4644 Err Out of fragment operations
2004-11-13 17:34:34 +01:00
jani@ua141d10.elisa.omakaista.fi
dc66722350
Fixed a function call.
2004-11-12 20:47:41 +02:00
jani@ua141d10.elisa.omakaista.fi
fe0b00985f
Merge with 4.0
2004-11-12 20:38:58 +02:00
monty@mysql.com
08c5b245b8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-11-12 19:08:33 +02:00
monty@mysql.com
c724163e14
Fix to allow usage of 4.0 tables with 4.1
2004-11-12 19:01:49 +02:00
serg@serg.mylan
eab281e25a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-12 16:48:02 +01:00
monty@mysql.com
b56851fd7a
Merge on pull
2004-11-12 17:48:01 +02:00
monty@mysql.com
e9c3887b58
After merge fixes
2004-11-12 17:44:17 +02:00
serg@serg.mylan
e20732b073
typos in error messages fixed
2004-11-12 16:41:53 +01:00
monty@mysql.com
9252656d49
merge with 4.0
2004-11-12 11:17:53 +02:00
ram@gw.mysql.r18.ru
77fe1baf1d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
2004-11-12 12:38:07 +04:00
ram@gw.mysql.r18.ru
ec025721bd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6551
2004-11-12 12:36:42 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
2ad7d5c662
Bug#6123 - GRANT USAGE creates useless mysql.db row
...
Prevent creation of a row which grants no rights
Test included
2004-11-11 20:59:03 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
6f39bf2b9c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469
2004-11-11 17:12:25 +00:00