miguel@hegel.local
8d1480f7c5
Windows fixes for VC++ compiler compability
2004-05-05 02:59:17 -03:00
Sinisa@sinisa.nasamreza.org
ee627d2510
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-05-04 23:05:37 +03:00
Sinisa@sinisa.nasamreza.org
68cb444c62
Fix for a multi table updates when one of the tables is not updated
...
but used in a nested query.
2004-05-04 23:04:05 +03:00
pem@mysql.comhem.se
e1182c5226
Correction of WL#1567: row_count() is -1 following non-insert/update/delete
...
statements.
2004-05-04 17:18:47 +02:00
dlenev@brandersnatch.localdomain
2c30359aa4
Manual merge of bugfix for Bug #1664 .
2004-05-04 19:13:18 +04:00
dlenev@brandersnatch.localdomain
c7fbcbca7a
Fix for remaining issues described in Bug #1664
...
"mysql_send_long_data() API call is completely broken".
Now we are resetting some members (long_data_supplied/null_value...) of Item_param to its
initial state after each execution of prepared statement. We also manipulating
Item_param::maybe_null/null_value only via Item_param::set_* setters which makes code a bit
more robust.
2004-05-04 19:08:19 +04:00
guilhem@mysql.com
5fcd62a13a
useless fixes for --report-password and --show-slave-auth-info (almost undocumented options),
...
just for beauty of truth.
2004-05-04 16:35:31 +02:00
guilhem@mysql.com
8ffa47c0d1
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-04 15:49:22 +02:00
guilhem@mysql.com
a5aeb8f7fa
Fix for Bug#3357 "If the statement is long, the error message is trunc and important info is lost";
...
in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
so that it is not cut by truncation if the query is very long (which happens if the query goes first).
2004-05-04 15:48:40 +02:00
bell@sanja.is.com.ua
af25c817fe
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-prep-4.1
2004-05-04 16:42:39 +03:00
bell@sanja.is.com.ua
c2f194f243
repetable test replaced with inline function
2004-05-04 16:37:04 +03:00
serg@serg.mylan
4fcff3d2f1
don't rely on readdir() returning . and .. first
2004-05-04 14:36:23 +02:00
bell@sanja.is.com.ua
5de8c225e2
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-05-04 15:35:11 +03:00
monty@mysql.com
59ddd8c738
Fix to handle unsigned data in prepared statements (Bug #3447 )
...
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404 )
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238 )
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.
2004-05-04 15:02:38 +03:00
pem@mysql.comhem.se
296ba0ea57
WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted
2004-05-04 13:45:20 +02:00
bell@sanja.is.com.ua
2fd0a66591
fixed db name and layout (can cause very rare race condition bug)
2004-05-04 13:07:36 +03:00
guilhem@mysql.com
6a6d5ef75e
trying to remove Windows compiler warnings (Miguel, could you please check if it's better now?)
2004-05-03 23:35:11 +02:00
serg@serg.mylan
8c2ce22e43
compatibility fix. warning removed
2004-05-03 18:26:50 +02:00
Sinisa@sinisa.nasamreza.org
333eadf1b2
Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT
2004-05-03 19:15:26 +03:00
ingo@mysql.com
c0aad5a1a8
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-wl1700-diff
2004-05-03 16:15:45 +02:00
ingo@mysql.com
5a78b4c746
WL#1700 - Properly count key_blocks_used and key_blocks_current.
...
Introduced a new free blocks list. Free blocks are now re-used before
new blocks are allocated from the pool. There is a new status variable
which can be queried by "show status like key_blocks_unused".
2004-05-03 15:55:21 +02:00
bell@sanja.is.com.ua
66e7ff2a8c
return table list of fake_select in empty state to prevent using TABLE_LIST allocated on stack in next execution of PS (Bug #3577 )
2004-05-03 13:58:01 +03:00
marko@hundin.mysql.fi
9efb2853ad
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-03 09:45:17 +03:00
bell@sanja.is.com.ua
25d815cde6
fixed zero result case for group functions in subquery (Bug #3505 )
...
fixed LIMIT 0 for zero rows optimisation
2004-05-02 13:03:49 +03:00
serg@serg.mylan
7df9f7d621
myisam_data_pointer_size
2004-05-01 15:41:59 +02:00
serg@serg.mylan
e95debcefe
removed duplicated check for thd->killed
2004-04-30 21:11:36 +02:00
serg@serg.mylan
0479213c10
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-30 14:16:34 +02:00
monty@mysql.com
0a95918ee9
Merge
2004-04-30 14:04:51 +03:00
monty@mysql.com
6678ecf19a
Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647 )
...
Added checking of cut read lines in bootstrap thread (Bug #2874 )
2004-04-30 14:02:17 +03:00
serg@serg.mylan
8128b7dbf7
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-30 10:43:59 +02:00
serg@serg.mylan
dbc024deb5
compatibility fix (bug#3606)
2004-04-30 10:42:12 +02:00
konstantin@mysql.com
07eaf18642
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-u2
2004-04-30 03:00:55 +04:00
konstantin@mysql.com
aec8522569
Fix for Bug#3035 "Prepared statement integer inserts": now unsigned
...
flag is sent to server with placeholder types.
There were no need to extend the protocol as one additional byte
was reserved for placeholder code, when placeholder code is in range 0-255.
So this byte is now used for flags. Post-review fixes added.
2004-04-30 03:00:19 +04:00
sergefp@mysql.com
40ac433e4b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-my-ps-bugs
2004-04-30 00:00:54 +04:00
marko@hundin.mysql.fi
a490b95b04
InnoDB: implement LOCK TABLE (Bug #3299 )
2004-04-29 16:42:33 +03:00
monty@mysql.com
32d0b69503
Allow one to send empty strings with mysql_stmt_send_long_data()
...
mysql_stmt_reset() now resets param->long_data_used
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413 )
Fixed problem with symlink test (bug in 4.1.2)
2004-04-28 20:19:50 +03:00
guilhem@mysql.com
e7fbd33acc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-04-28 18:31:31 +02:00
guilhem@mysql.com
3fc39188ec
A new option --replicate-same-server-id to force a slave to execute queries originating from itself
...
(WL#794). This can be of interest in some recovery-from-backup scenarios, and also when you have
two databases in one mysqld, having a certain similarity and you want one db to be updated when the other is
(some sort of trigger).
Plus small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"
2004-04-28 18:24:46 +02:00
monty@mysql.com
f61b08a24b
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-04-28 18:38:30 +03:00
antony@ltantony.dsl-verizon.net
9bd11ea8f6
Merge ltantony.dsl-verizon.net:/usr/home/antony/work/mysql-4.0
...
into ltantony.dsl-verizon.net:/usr/home/antony/work/bug3481
2004-04-28 16:38:29 +01:00
antony@ltantony.dsl-verizon.net
28870228d4
Fix for Bug 3481
...
CREATE statement allowed extra unnecessary commas
2004-04-28 16:14:53 +01:00
monty@mysql.com
f10d098f7d
Fixed http address in some scripts (Bug #3460 )
...
Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix)
Fixed that INTERVAL can handle big integers. (Bug #3498 )
Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473 )
2004-04-28 17:45:08 +03:00
serg@serg.mylan
2bcfab10ea
bug#3556 - soundex
2004-04-28 14:19:02 +02:00
pem@mysql.comhem.se
d42b145817
Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc
...
merged manually by guilhem.
2004-04-28 12:08:54 +02:00
monty@mysql.com
edc584acce
Fixed stack overrun with some INSERT ... SELECT ... GROUP BY queries (Bug #3265 )
...
Ensure that raid_chunks is not set to higher than 255 as this could cause problems with DROP DATABASE. (Bug #3182 )
2004-04-28 03:37:45 +03:00
sergefp@mysql.com
cc2eb9d5c3
Renamed MY_LEX_COLON to MY_LEX_SEMICOLON (at Serg's request)
2004-04-28 01:49:05 +04:00
sergefp@mysql.com
bcf9350e4e
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-bug3567
2004-04-27 23:37:14 +04:00
monty@mishka.local
ef18b13738
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2004-04-27 15:48:48 +03:00
monty@mishka.local
e9cfe01db0
After merge fixes
...
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
2004-04-27 15:33:40 +03:00
sergefp@mysql.com
b8802c514d
Fix for BUG#3567: Disallow several SQL statements inside a Prepared Statement.
2004-04-27 03:44:41 +04:00