mskold@mysql.com
18d5e9b45c
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-09-28 10:34:26 +02:00
mskold@mysql.com
1b9d0b340d
Adjusted so auto_increment value after bulk insert will be exactly +1 after last (if no parallel inserts)
2004-09-28 09:53:14 +02:00
magnus@shellback.(none)
19787199ec
Correct merge problem
2004-09-28 08:53:21 +02:00
rburnett@build.mysql.com
476705df18
Merge build.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/rburnett/mysql-4.0
2004-09-27 23:22:08 +02:00
tomas@poseidon.ndb.mysql.com
8e653fcb04
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-09-27 16:11:58 +00:00
jan@hundin.mysql.fi
7d9766b107
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-09-27 10:46:02 +03:00
tomas@poseidon.ndb.mysql.com
1379567be1
removed init on ConfigRetriever
...
added some debug printouts
some changes in ndbcluster_init to make start of mysqld first work
2004-09-27 00:24:23 +00:00
dlenev@mysql.com
4ff9f1f558
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg4131-3
2004-09-27 00:50:29 +04:00
dlenev@mysql.com
263b33e12d
Fix for bug #4131 "TIMESTAMP columns missing minutes and seconds when
...
using GROUP BY"
Now we are setting Field_timestamp::field_length to 19 in open_table()
if we are in new mode (and we are restoring it back when we are coming
back to normal mode). This also should solve potential problems with
some of LOAD DATA INFILE and SELECT * INTO in this mode.
2004-09-27 00:50:00 +04:00
bar@noter.intranet.mysql.r18.ru
010f4242b7
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into noter.intranet.mysql.r18.ru:/root/mysql-4.1
2004-09-26 21:55:17 +05:00
bar@noter.intranet.mysql.r18.ru
29b8c6b1e0
bug #5723 length(varchar utf8 field) returns verying results
2004-09-26 21:52:20 +05:00
bell@sanja.is.com.ua
b9bd1bde34
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-dump-5.0
2004-09-26 19:09:43 +03:00
bell@sanja.is.com.ua
ff102adddf
fix xml with view
2004-09-26 19:00:55 +03:00
magnus@shellback.(none)
e5ff827178
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into shellback.(none):/home/magnus/mysql/mysql-4.1-ndb
2004-09-26 17:49:02 +02:00
mskold@mysql.com
f29939c453
Setting MODE_NO_AUTO_VALUE_ON_ZERO at copying in copy_data_between_tables
2004-09-26 17:11:28 +02:00
bell@sanja.is.com.ua
75b628b89d
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-09-26 17:31:06 +03:00
bell@sanja.is.com.ua
10a081a05a
postreview fix
2004-09-26 17:26:32 +03:00
magnus@shellback.(none)
94b305b226
Merge
2004-09-26 16:21:15 +02:00
magnus@shellback.(none)
059941db21
WL#1424 Updated after review
...
* Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock
* Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find.
2004-09-26 16:11:24 +02:00
brian@brian-akers-computer.local
4ed0b1c200
Two cleanups for IRIX build.
2004-09-26 15:58:10 +02:00
rburnett@build.mysql.com
2bff96e291
Bug #5539 SHOW DATABASES LIKE and symlinks
...
sql_show.cc:
Made change suggested by Serge. REmoved else in mysql_find_files so symlink files fall through to the wildcard check
2004-09-25 18:43:07 +02:00
bell@sanja.is.com.ua
6df58cc97e
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-09-25 18:37:28 +03:00
bell@sanja.is.com.ua
cd32040889
some comments added
2004-09-25 16:05:50 +03:00
magnus@shellback.(none)
9e359d2397
Clean up of index_name and unique_index_name
2004-09-25 14:35:27 +02:00
bell@sanja.is.com.ua
f3e6405ff1
postreview fixes (BUG#5618 & BUG#5590)
2004-09-25 15:07:50 +03:00
mskold@mysql.com
f2c2279b69
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-25 10:34:24 +02:00
tomas@poseidon.ndb.mysql.com
71d5ea8f85
fix for invalidating table if mismatch with frm
...
removed debug printout
new test in alter table for dictionay update test with multiple connections
added coice of setting MaxNoOfOrderedIndexes
added option to run "--small-bench"
2004-09-24 16:58:25 +00:00
ingo@mysql.com
e47decfa7f
BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S).
...
BUG#4335 - one name can be handler open'ed many times.
Reworked the HANDLER functions and interface.
Using a HASH to store information on open tables that
survives FLUSH TABLE.
HANDLER tables alias names must now be unique, though it
is allowed in 4.0 to qualify them with the database name
of the base table.
2004-09-24 18:39:25 +02:00
guilhem@mysql.com
a5dac99ae0
Merge gbichot@bk-internal.mysql.com://home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0
2004-09-24 18:25:54 +02:00
guilhem@mysql.com
2b2de7b62f
In binary log events, flags are 2 bytes, not 4. Using 4 resulted in buffer overflow (and on a certain build it resulted in overwriting another part of the event without crashing :( ).
2004-09-24 18:25:06 +02:00
dlenev@brandersnatch.localdomain
258b84d6c0
For now we will require super privilege for creating/dropping trigger because proper
...
privilege checking is not in place yet.
2004-09-24 17:55:43 +04:00
tomas@poseidon.ndb.mysql.com
0273e84b7f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-09-24 11:07:55 +00:00
guilhem@mysql.com
53d0daa3a0
Fix for BUG#3248 "Doc says MyISAM warns if disk full but it does not":
...
we force the message to the error log, and we make it more informative;
we treat EDQUOT like ENOSPC.
2004-09-24 11:54:37 +02:00
konstantin@mysql.com
7b97b5b007
Fix alignment.
2004-09-24 13:50:53 +04:00
bell@sanja.is.com.ua
2264bb01ca
new show create view output
...
mysqldump view support (BUG#4972)
workaround to allow view work after LOCK TABLES
2004-09-24 12:50:10 +03:00
bar@noter.intranet.mysql.r18.ru
b5b7801917
logging_ok:
...
Logging to logging@openlogging.org accepted
sql_show.cc, type_enum.test, type_enum.result:
Bug #5628 German characters in field-defs will be '?' with some table definitions
2004-09-24 13:14:44 +05:00
rburnett@build.mysql.com
de9a058bfe
Bug #5539 SHOW DATABASES LIKE and symlinks
...
sql_show.cc:
Added wild card check to symdir block in mysql_find_files
2004-09-24 09:00:14 +02:00
guilhem@mysql.com
c163a67a4d
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-09-23 17:56:21 +02:00
konstantin@mysql.com
aa80184072
A fix and test case for bug#5688 "Upgraded 4.1.5 Server seg faults"
2004-09-23 18:01:55 +04:00
guilhem@mysql.com
564b8edb45
Fix for BUG#5711 "replication SQL thread does not abort on SQL syntax error":
...
in net_printf(), we fill net->last_* variables for the slave SQL thread to know the error.
2004-09-23 14:43:31 +02:00
dlenev@mysql.com
12f7fb8233
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-memroot
2004-09-23 16:41:35 +04:00
hf@deer.(none)
7f7f7b0d5f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.5371
2004-09-23 17:01:30 +05:00
guilhem@mysql.com
00d2e803dc
Fix for BUG#5705: "SET CHARATER_SET_SERVERetc will be lost if STOP SLAVE before following query":
...
we do not increment rli->group_master_log_pos if we are just after a SET ONE_SHOT (it's not a standalone event)
2004-09-23 12:16:56 +02:00
hf@deer.(none)
5301a08091
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.5371
2004-09-23 15:12:32 +05:00
dlenev@mysql.com
d2a2904719
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-memroot
2004-09-23 13:52:00 +04:00
dlenev@brandersnatch.localdomain
f5d1b711c6
Implementation of Monty's idea about clear_alloc_root() optimization and cleanup of work
...
with memory roots in THD/Statement/Item_arena.
Added assertions preventing memory allocation on bzero'ed MEM_ROOT since it is worked by
pure luck and was very ineffective.
2004-09-23 13:48:17 +04:00
jan@hundin.mysql.fi
97e30064b2
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-09-23 10:11:28 +03:00
hf@deer.(none)
d8c626eb53
Additional fix for bug #5136 (Geometry object is corrupted when queried)
...
CREATE TABLE t1 SELECT POINT(1,2); fixed
2004-09-22 22:36:53 +05:00
mskold@mysql.com
f06d8027ea
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-22 17:30:51 +02:00
konstantin@mysql.com
36548b10ca
A fix and test case for Bug#5315 "mysql_change_user() doesn't free
...
prepared statements."
2004-09-22 15:50:07 +04:00