vva@eagle.mysql.r18.ru
00d429ac51
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
2004-04-03 02:47:02 +05:00
vva@eagle.mysql.r18.ru
5f2d73ed96
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
2004-04-03 02:46:12 +05:00
vva@eagle.mysql.r18.ru
8cc3b3cfdc
made some optimization of last patch for
...
Bug #2385 "CREATE TABLE LIKE lacks locking on source and destination table"
(in sql_table.cc and mysql-test/t/synchronization.test)
2004-04-03 02:44:38 +05:00
vva@eagle.mysql.r18.ru
1198b23a73
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2397/mysql-4.1
2004-04-03 01:39:45 +05:00
serg@serg.mylan
fced5fa188
cleanup of ha_myisam::deactivate_non_unique_index() and Co.
2004-04-02 20:42:35 +02:00
miguel@hegel.local
d17e85b764
Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hegel.local:/home/miguel/bk/mysql-4.1
2004-04-02 11:10:29 -03:00
marko@hundin.mysql.fi
23a5fc5558
InnoDB: ignore intra-database foreign key references between tables
...
when dropping database (Bug #3058 )
2004-04-02 16:25:48 +03:00
pem@mysql.comhem.se
fce57a1190
Added missing error message and corrected another one.
2004-04-02 10:27:01 +02:00
dlenev@jabberwock.localdomain
f6bff2e6c6
WL#1266 "Separate auto-set logic from TIMESTAMP type."
...
Final version of patch.
Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
clauses for TIMESTAMP field definition.
Current implementation allows only one such field per table and
uses several unireg types for storing info about this properties of
field. It should be replaced with better implementation when new
.frm format is introduced.
2004-04-02 10:12:53 +04:00
bell@sanja.is.com.ua
4533338075
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-on-4.1
2004-04-01 23:48:21 +03:00
dlenev@jabberwock.localdomain
a80f46bfdf
WL#775 "Add status variable identifying binlog_cache_size shortage"
...
Added two status variables:
binlog_cache_use - counts number of transactions that used somehow
transaction temporary binary log.
binlog_cache_disk_use - counts number of transactions that required
disk I/O for storing info in this this binary log.
2004-04-02 00:47:20 +04:00
bell@sanja.is.com.ua
de502e1df2
removed unused field
...
layout fised
debug information added
2004-04-01 23:27:22 +03:00
miguel@hegel.local
79959f3777
Fix for bug #3359 . Bad named pipe name.
2004-04-01 16:22:54 -03:00
vva@eagle.mysql.r18.ru
15cd52c6cb
added synchronization in mysql_create_like_table
...
(
fixed BUG #2385 CREATE TABLE LIKE lacks locking on source and destination table
and added tests for it
)
2004-04-01 23:13:25 +05:00
vva@eagle.mysql.r18.ru
7a580ce991
fixed
...
BUG #2397 "RENAME TABLES is not blocked by FLUSH TABLES WITH READ LOCK"
(added waiting for global_read_lock in mysql_rename_tables)
2004-04-01 22:47:09 +05:00
marko@hundin.mysql.fi
e00bf40360
InnoDB cleanup: fixing buffer overflows and quoting of quotes
2004-04-01 16:51:34 +03:00
brian@brian-akers-computer.local
dfba8cdf50
First commit of the skeleton storage engine. Use this example as a template to build storage engines. Also includes a new degine for marking storage engine methods as not being implemented.
2004-04-01 01:02:42 -08:00
bell@sanja.is.com.ua
5568155e04
fix for table/field caching mechanism
...
save moving ON/USING tables conditions to WHERE clause (BUG#2794)
2004-04-01 03:00:38 +03:00
dlenev@brandersnatch.localdomain
ad7e09dec4
More after-merge fixes for patch fixing bug #2050
2004-04-01 00:19:30 +04:00
dlenev@brandersnatch.localdomain
f38e0a935d
Merge of fix for bug #2050 and bug #3307
2004-03-31 22:17:10 +04:00
dlenev@brandersnatch.localdomain
4122188cc2
Fix for Bug #3307 "FLUSH TABLES sometimes breaks prepared statement
...
table resolution".
Added members to Item_ident for storing original db, table and field
names since those that set later from Field have shorter life-time
than required by prep. stmt. So we need to restore original names in
Item_ident::cleanup(). Also now using special construnctor for creation
of Item_field from Field object that ensures that table and field name
have big enough life-time.
"Fix" for bug #2050 "10 to 1 performance drop with server 4.1.1"
Clean ups in implementation of caching of field number in table.
Added caching of table in which field is found in find_field_in_tables().
2004-03-31 21:25:55 +04:00
gluh@gluh.mysql.r18.ru
da3308ef57
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.1
2004-03-31 14:30:53 +05:00
gluh@gluh.mysql.r18.ru
daba6b63b8
Fix for bug #2160 : Extra error message for CREATE TABLE LIKE with InnoDB
2004-03-31 14:29:01 +05:00
bell@sanja.is.com.ua
99f712a30b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2004-03-31 08:24:12 +03:00
monty@mysql.com
2af9056aa3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-31 03:32:57 +03:00
monty@mysql.com
ddafa2cc16
simple optimzation
...
Portability fixes
2004-03-31 03:32:38 +03:00
konstantin@dragonfly.local
4a4f5fc601
Stubs for types/names of placeholders, cursor flags and array execution count
...
implemented in the client library and server.
Warning: this makes the new client library and server incompatible with all
previous versions and 5.0.
2004-03-31 02:27:49 +04:00
bell@sanja.is.com.ua
e3a619f005
null processing for character_set_results (BUG#3296)
2004-03-30 23:38:56 +03:00
monty@mysql.com
fede76ddf2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-30 22:20:40 +03:00
monty@mysql.com
34df0b3d1c
Force clients to recompile if client lib changes (Bug #3009 )
2004-03-30 22:13:25 +03:00
ingo@mysql.com
85ec87a094
Worklog#1563 - Support of on-line CREATE/DROP INDEX.
...
This is to enable table handlers to implement online create/drop index.
It consists of some parts:
- New default handler methods in handler.h
- Split of mysql_alter_table. It decides if only one kind of
alteration is to be done (e.g. only create indexes or only drop
indexes etc.) It then calls the specialized new handler method if
the handler implements it. Otherwise it calls real_alter_table.
- The parser sets flags for each alter operation detected in a
command. These are used by mysql_alter_table for the decision.
- mysql_prepare_table is pulled out of mysql_create_table. This is
also used by mysql_create_index to prepare the key structure array
for the handler. It is also used by mysql_create_index and
mysql_drop_index to prepare a call to mysql_create_frm.
- mysql_create_frm is pulled out of rea_create_table for use by
mysql_create_index and mysql_drop_index after the index is
created/dropped.
Thanks to Antony who supplied most of the changes.
2004-03-30 19:22:14 +02:00
bar@bar.intranet.mysql.r18.ru
b92dd45da4
ALTER TABLE t1 CONVERT TO should also change the default character set.
...
Forgot to do it in the previous commit.
2004-03-30 22:18:49 +05:00
bar@bar.intranet.mysql.r18.ru
dba73e1c86
More different syntaxes for (1) modifying the default charaset/collation
...
and for (2) converting the columns:
1. ALTER TABLE t1 [DEFAULT] CHARACTER SET xxx [COLLATE yyy]
2. ALTER TABLE t1 CONVERT TO CHARACTER SET xxx [COLLATE yyy]
2004-03-30 21:33:45 +05:00
monty@mysql.com
f602829c75
Fix to get correct metadata when using temporary tables to create result. (Bug #2654 )
2004-03-30 19:24:28 +03:00
bell@sanja.is.com.ua
54d5f4ae8f
query cache statistic fixed
2004-03-30 18:47:04 +03:00
ram@gw.mysql.r18.ru
3bfbe6e0dd
resolving conflicts
2004-03-30 16:04:08 +05:00
ram@gw.mysql.r18.ru
fffe1e8424
An improvement of
...
ChangeSet
1.1707 04/03/19 12:36:55 ram@gw.mysql.r18.ru +4 -0
Fix for the bug #2976 : NATURAL JOIN produces duplicate columns.
2004-03-30 15:54:26 +05:00
Sinisa@sinisa.nasamreza.org
6e79ece190
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-30 13:52:53 +03:00
Sinisa@sinisa.nasamreza.org
2ff3f487aa
A fix for the error message when database can not be dropped due to
...
the extra files being present.
2004-03-30 13:50:00 +03:00
monty@mysql.com
4bc6b551f8
false/true -> FALSE/TRUE
...
Fixes after last merge
2004-03-30 02:32:41 +03:00
monty@mysql.com
585d97b741
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-30 01:43:45 +03:00
konstantin@oak.local
19d09a2a9c
Better comment.
2004-03-30 02:03:42 +04:00
monty@mysql.com
dc2f606fb8
Merge with 4.0 to get lastest bug fixes
2004-03-29 19:21:53 +03:00
monty@mysql.com
505970b4a7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-29 17:57:59 +03:00
monty@mysql.com
e6882bbfd8
Disable INSERT DELAYED for embedded library
2004-03-29 17:57:07 +03:00
bar@bar.intranet.mysql.r18.ru
928e796e67
Better error messages for not nullable
...
SET character_set_xxx=NULL
and
SET collation_xxx=NULL
2004-03-29 18:33:24 +05:00
bar@bar.intranet.mysql.r18.ru
699dafefa2
sql_db.cc:
...
More clear error message.
2004-03-29 11:05:27 +05:00
dlenev@brandersnatch.localdomain
9e28b7698d
"Fix" for BUG #2050 "10 to 1 performance drop with server 4.1.1".
...
Actually it is not a bug but right behavior observed as pefomance
degradation after we have forced Item_field::fix_fields() to
re-execute each time when we are executing prep stmt.
This patch implements small optimization which heals this bad
behavior. We are caching field position in TABLE::field array in
Item's member and are using this position for speeding up field
lookups in fix_fields() in case of its re-execution.
2004-03-28 04:11:54 +04:00
guilhem@mysql.com
19f0843f3f
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2004-03-27 01:08:29 +01:00
guilhem@mysql.com
3826a01ee4
A previous changeset by me today about SQL_LOG_BIN had the problem
...
that it tested the privilege in ::update() whereas it should be
in ::check() (see email from Serg, subject
"Re: bk commit - 4.1 tree (guilhem:1.1706)").
So I add instead a check_func function to sys_var_thd_bit.
I do the same addition to sys_var_thd_ulong, to unify handling
of PSEUDO_THREAD_ID with the one of SQL_LOG_BIN. So class
sys_var_pseudo_thread_id is not needed anymore, removing it.
2004-03-27 01:07:09 +01:00
vva@eagle.mysql.r18.ru
c81bf339c2
some cleanup of last patch for BUG #2342
2004-03-27 02:37:05 +04:00
vva@eagle.mysql.r18.ru
8a66c13b34
fixed bug #2342
...
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"
2004-03-27 02:29:31 +04:00
vva@eagle.mysql.r18.ru
1eff4744f1
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2342/mysql-4.0
2004-03-27 00:41:48 +04:00
vva@eagle.mysql.r18.ru
23d30c397d
fixed bug #2342
...
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"
1. added new status HA_ADMIN_REJECT and processing of it in mysql_admin_table
2. got ha_berkley::analyze to return HA_ADMIN_REJECT if there are any
transactions with the table..
2004-03-27 00:35:45 +04:00
guilhem@mysql.com
380134891d
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2004-03-26 19:29:10 +01:00
guilhem@mysql.com
8066c2ce75
Changing SET SQL_LOG_BIN so that it explicitely throws an error if
...
user is not SUPER, instead of setting the value but ignoring it
silently internally.
2004-03-26 19:25:22 +01:00
guilhem@mysql.com
90a5e244be
To save 32KB memory per thread when --log-bin is not used, we do not
...
init the binlog_cache (THD::transaction.trans_log).
I have checked all places where trans_log is used, because as now
it may not be inited in some cases, we have to be cautious
(will forward this commit mail to Heikki).
2004-03-26 19:11:37 +01:00
Sinisa@sinisa.nasamreza.org
e2b48a2232
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-26 17:01:55 +02:00
Sinisa@sinisa.nasamreza.org
09d26f0ff6
order_by.result:
...
result of the test case for FORCE INDEX on ORDER BY
order_by.test:
test case for FORCE INDEX on ORDER BY
sql_select.cc:
Changing behaviour that MySQL server takes FORCE INDEX clause into account when optimising ORDER BY clause
2004-03-26 17:01:13 +02:00
bell@sanja.is.com.ua
a0f629385f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-03-26 16:19:45 +02:00
bell@sanja.is.com.ua
0f0239fde1
typo in comment fixed
2004-03-26 15:08:06 +02:00
bar@bar.intranet.mysql.r18.ru
3aea3e92ce
1. New data types, from the user point of view:
...
BINARY(N) and VARBIBARY(N)
2. More 4.0 compatibility and more BINARY keyword consistency:
2a. CREATE TABLE a (a CHAR(N) BINARY)
is now synonym for
CREATE TABLE a (a CHAR(N) COLLATE xxxx_bin)
2b. SELECT BINARY x
is still synonin for
SELECT x COLLATE xxxxx_bin.
2004-03-26 16:11:46 +04:00
monty@mysql.com
447baa9011
After merge fixes + simple optimizations
2004-03-26 11:06:53 +02:00
bell@sanja.is.com.ua
9ed179ee8e
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
2004-03-26 10:53:13 +02:00
monty@mysql.com
e0e0314d60
Merge with 4.0
2004-03-25 23:29:45 +02:00
monty@mysql.com
3b34a6a2dd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-25 22:18:31 +02:00
monty@mysql.com
1448199bd7
Cleanups & safety fixes
2004-03-25 22:11:22 +02:00
monty@mysql.com
ce79eb9ca7
merge with 3.23
2004-03-25 22:05:09 +02:00
monty@mysql.com
d6f9fa0376
Improved test case
...
service backport from 4.0
2004-03-25 21:52:25 +02:00
pem@mysql.com
e5f9e18d2f
Merge fix.
2004-03-25 17:48:00 +01:00
pem@mysql.comhem.se
6395822932
Fixed BUG#3117: LAST_INSERT_ID() works incorrectly inside stored procedure.
...
This turned out to be a problem for prepared statements as well; the id was
evaluated once, at parse time.
2004-03-25 17:42:13 +01:00
monty@mysql.com
eb91f7b478
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-25 15:05:42 +02:00
monty@mysql.com
ebc3b3afac
BTREE-indexes in HEAP tables can now be used to optimize ORDER BY
...
Don't read character set files if we are using only the default charset. In most cases the user will not anymore get a warning about missing character set files
Compare strings with space extend instead of space strip. Now the following comparisons holds: "a" == "a " and "a\t" < "a". (Bug #3152 ).
Note: Because of the above fix, one has to do a REPAIR on any table that has an ascii character < 32 last in a CHAR/VARCHAR/TEXT columns.
2004-03-25 15:05:01 +02:00
bell@sanja.is.com.ua
3bf55c9a3d
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-alias-4.1
2004-03-25 14:40:36 +02:00
hf@deer.(none)
1d5c7c2f9b
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-25 12:50:23 +04:00
hf@deer.(none)
7e5a6efcf1
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-25 11:38:53 +04:00
hf@deer.(none)
44e34ad816
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3264
2004-03-25 11:36:52 +04:00
paul@ice.snake.net
44fe065a39
I didn't get a couple of system variables alphabetized correctly.
2004-03-24 20:30:49 -06:00
paul@ice.snake.net
f47e32473b
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-24 15:28:14 -06:00
serg@serg.mylan
b84a9dcf86
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-24 17:24:08 +01:00
serg@serg.mylan
07c19b44ef
accorting to the manual, when neither GLOBAL or SESSION in SET
...
is specified, the default is SESSION.
2004-03-24 16:33:47 +01:00
serg@serg.mylan
34c28c6bd9
SHOW PRIVILEGES updated (Bug#3227)
2004-03-24 14:44:31 +01:00
bar@bar.intranet.mysql.r18.ru
3827fa5589
Unicode Collation Algorithm subset implementation
2004-03-24 16:16:08 +04:00
bell@sanja.is.com.ua
aa3f28722c
fixed function name in a comment
2004-03-24 11:54:58 +02:00
paul@ice.snake.net
b8674a464e
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-23 22:48:30 -06:00
bell@sanja.is.com.ua
f90e7c24e8
fixed debug information
2004-03-23 19:28:18 +02:00
bell@sanja.is.com.ua
e5b2e9b132
removed unneeded bzero
2004-03-23 19:24:35 +02:00
hf@deer.(none)
386feb494b
Fix for #3264 (FROM_DAYS doesn't work properly in range comparison)
...
Item_func_from_days::get_date didn't change 'hr', 'min' and some
other fields of incoming ltime, so they got random values.
bzeroing of the ltime added
2004-03-23 21:10:23 +04:00
bell@sanja.is.com.ua
19ffa1cd53
used right table for grants check (BUG#3270)
2004-03-23 17:15:20 +02:00
serg@serg.mylan
0d0910381a
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-23 15:25:45 +01:00
hf@deer.(none)
87612b5294
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-23 17:58:55 +04:00
hf@deer.(none)
7ab1c2106d
Fix for #3266 (garbled TEXT fields as a result of CREATE TABLE SELECT)
...
Problem is that Item::save_in_field modifies str_value member
before it calls val_str but Item_copy_string::val_str just returns
this str_value as the result.
I added local String variable to the Item::save_in_field
2004-03-23 17:57:14 +04:00
serg@serg.mylan
99886df867
correct support for a mix of UNION/UNION ALL in the same query.
...
Bug#1428
2004-03-23 14:43:24 +01:00
bell@sanja.is.com.ua
ce7798c45e
fixed union with prepared statement bug found by Konstantin
2004-03-23 14:26:54 +02:00
hf@deer.(none)
ea2c160919
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3188
2004-03-23 13:09:50 +04:00
paul@ice.snake.net
d30313666a
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-22 14:39:09 -06:00
Sinisa@sinisa.nasamreza.org
6c389aff75
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-22 16:36:27 +02:00
Sinisa@sinisa.nasamreza.org
2eaa07f199
union.result:
...
A test case for the bug that allowed table names to be used in ORDER BY columns (But #3064 )
union.test:
A test case for the bug that allowed table names to be used in ORDER BY columns (But #3064 )
sql_union.cc:
A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064 )
2004-03-22 16:35:15 +02:00
hf@deer.(none)
182aa5bec9
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-03-22 17:48:29 +04:00
bell@sanja.is.com.ua
bbb6642a66
aliases should be compared with my_strcasecmp (BUG#3251)
...
some db comparison code cleupup
removed compiler warnings
2004-03-22 15:43:13 +02:00
paul@ice.snake.net
7b45773fa6
Some SHOW STATUS lines were in non-alphabetic order.
2004-03-21 15:58:08 -06:00
bell@sanja.is.com.ua
7411ac19df
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
2004-03-21 16:39:37 +02:00
bell@sanja.is.com.ua
b0722aad12
fixed BUG in query cahe statistic counting
2004-03-21 11:48:51 +02:00
serg@serg.mylan
61a365e696
more sys_var_str fixes
2004-03-20 17:08:01 +01:00
serg@serg.mylan
d1f1bbefab
sys_var_str.value is never NULL
2004-03-20 15:56:20 +01:00
guilhem@mysql.com
f657ea978b
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-20 15:49:55 +01:00
guilhem@mysql.com
d89f148de6
The automatic DROP TEMPORARY TABLE is now DROP TEMPORARY TABLE IF EXISTS,
...
this is better in this case:
- imagine user1 has created a temp table
- imagine user2 does FLUSH TABLES WITH READ LOCK, then takes a backup,
then RESET MASTER then UNLOCK TABLES, like mysqldump --first-slave
- then in the binlog you will finally have the DROP TEMPORARY TABLE,
but not the CREATE TEMPORARY TABLE, so when you later restore with
mysqlbinlog|mysql, mysql will complain that table does not exist.
Replication was already protected of this (it processes DROP TEMPORARY
TABLE as if there was a IF EXISTS), now I add it directly to the query
for mysqlbinlog|mysql to work.
2004-03-20 15:49:17 +01:00
serg@serg.mylan
10a4ed0e00
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-20 14:36:49 +01:00
serg@serg.mylan
581996393a
select @@smth=@@sys_str_var crash fixed
2004-03-20 14:36:00 +01:00
bell@sanja.is.com.ua
e0766ed685
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
2004-03-20 14:36:58 +02:00
bell@sanja.is.com.ua
b7efa3e5f6
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
2004-03-20 13:37:30 +02:00
bell@sanja.is.com.ua
d095d4753e
after review changes
2004-03-20 13:36:26 +02:00
monty@mysql.com
042af556d5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-20 12:50:12 +02:00
monty@mysql.com
b49b24d94a
Added test to show bug in current union implementation
...
After merge fixes
Portability fixes
2004-03-19 18:33:38 +02:00
serg@serg.mylan
13946359c6
DROP DATABASE now returns (affected_rows) number of tables dropped
2004-03-19 16:43:03 +01:00
monty@mysql.com
933278a52b
merge with 4.0 (to get compiler error fixes for innodb)
2004-03-19 15:17:56 +02:00
gluh@gluh.mysql.r18.ru
00630a2640
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-19 14:36:12 +04:00
gluh@gluh.mysql.r18.ru
e9341da7e7
Fix for bug#1439 UDF Corruption
2004-03-19 14:35:00 +04:00
ram@gw.mysql.r18.ru
fd01314cc8
Fix for the bug #2976 : NATURAL JOIN produces duplicate columns.
...
Improvement natural join code in the setup_conds().
2004-03-19 12:36:55 +04:00
bar@bar.intranet.mysql.r18.ru
66631a3c1e
Bug #3087 CONCAT_WS makes the server die in case of illegal mix of collations
2004-03-19 12:09:14 +04:00
bar@bar.intranet.mysql.r18.ru
f897144c4e
Bug #2821 Table default character set affects LONGBLOB fields
2004-03-19 11:37:49 +04:00
bell@sanja.is.com.ua
ede07fcdcf
fixed signed numeric literal parsing
2004-03-18 18:27:03 +02:00
bell@sanja.is.com.ua
613104ad25
merge
2004-03-18 15:21:06 +02:00
bell@sanja.is.com.ua
2b45b53066
DBUG_ASSERT(fixed == 1); added to val*
...
small optimisation in signed_literal
2004-03-18 15:14:36 +02:00
hf@deer.(none)
e93b933ade
Fix for #3188
2004-03-18 16:49:48 +04:00
gluh@gluh.mysql.r18.ru
7aee76256b
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-18 15:54:04 +04:00
gluh@gluh.mysql.r18.ru
1dfe9a0330
Fix for valgrind errors in str_to_TIME(using of uninitialize variable).
2004-03-18 15:51:08 +04:00
serg@serg.mylan
47747685a3
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-18 11:04:36 +01:00
serg@serg.mylan
1c658417b1
make DROP DATABASE to behave as documented in the manual - to report number of files deleted
2004-03-18 11:03:24 +01:00
monty@mysql.com
19d0a60eca
Don't change server suffix if given to configure
...
Portability fixes
2004-03-18 01:48:46 +02:00
monty@mysql.com
53c810cda4
merge fixes (use old code)
2004-03-18 00:16:04 +02:00
monty@mysql.com
f34a642d6e
after merge fixes
2004-03-18 00:09:13 +02:00
heikki@hundin.mysql.fi
43706715da
ha_innodb.cc:
...
Add a comment that InnoDB always retrieves the row id, if the clustered index was internally generated by InnoDB. Then we know the 'ref' to the row.
2004-03-17 22:28:49 +02:00
paul@teton.kitebird.com
24baf74c15
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-17 12:43:16 -06:00
paul@teton.kitebird.com
f71f714773
Fix typo.
2004-03-17 12:28:26 -06:00
heikki@hundin.mysql.fi
e8efe9c32a
Many files:
...
Fix Bug #1942 : do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY
2004-03-17 19:37:48 +02:00
paul@teton.kitebird.com
9bf6b3eaf9
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-17 11:15:36 -06:00
konstantin@mysql.com
b9f51f7081
WL #1510 "Implement support for "commercial" binaries on handshake",
...
client library:
- implemented 'check_license' function
2004-03-17 20:04:50 +03:00
ram@gw.mysql.r18.ru
99d374159a
merge
2004-03-17 18:57:51 +04:00
paul@teton.kitebird.com
60a3104b03
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-17 08:56:22 -06:00
ram@gw.mysql.r18.ru
757cff9f9b
Code cleanup:
...
- added unsigned_flag= 1; to Item_uint constructors
- removed Item_uint::fix_fields()
- added a comment about fix_fields() call
2004-03-17 18:40:04 +04:00
bell@sanja.is.com.ua
8035ce40ec
DBUG_ASSERT(fixed == 0) added to fix_fields()
2004-03-17 14:26:26 +02:00
gluh@gluh.mysql.r18.ru
9863b6aed9
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-17 16:19:52 +04:00
gluh@gluh.mysql.r18.ru
84e04c74c5
Fix for bug#3086: SHOW GRANTS doesn't follow ANSI_QUOTES
2004-03-17 16:19:09 +04:00
ram@gw.mysql.r18.ru
16179dbef0
Fix for the bug #3155 : strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
...
(test case is too big to be included, take a look at the bug database)
2004-03-17 15:30:17 +04:00
hf@deer.(none)
5868807b92
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.233
2004-03-17 14:04:02 +04:00
guilhem@mysql.com
6948c9d9be
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-17 10:35:55 +01:00
guilhem@mysql.com
0f3600d51e
Fix for BUG#2922 "Crash (signal11) after "load data from master""
...
with a testcase.
We needed to init_master_info before we flush_master_info
in LOAD DATA FROM MASTER.
2004-03-17 10:35:03 +01:00
monty@mysql.com
f9ad650490
merge with 4.0
2004-03-17 10:36:12 +02:00
monty@mysql.com
44667503b7
After merge fixes
2004-03-17 10:30:40 +02:00