konstantin@mysql.com
29b88ff539
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-24 19:09:31 +04:00
konstantin@mysql.com
a30fcdc690
Fix for Bug#4030 "Client side conversion string -> date type doesn't
...
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
2004-06-24 19:08:36 +04:00
bar@mysql.com
62aeb88638
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-06-24 18:51:32 +05:00
bar@mysql.com
aa27a7858e
"Version" column in SHOW TABLE STATUS.
2004-06-24 18:46:41 +05:00
mskold@mysql.com
8ba4ab195f
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-06-24 15:32:33 +02:00
guilhem@mysql.com
e14aef7820
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-06-24 15:32:32 +02:00
mskold@mysql.com
29746be6a8
Cosmetic fixes
2004-06-24 14:49:34 +02:00
guilhem@mysql.com
d8fe091e28
Enabling the --innodb-safe-binlog option in code. If you wish to disable it,
...
you just need to change this line of mysqld.cc:
#if MYSQL_VERSION_ID >= 40103
to, say,
#if MYSQL_VERSION_ID > 40103
I am noticing a failure of bdb.test; I believe this is not related to the
code I added yesterday and today, but I am checking. In any case I push this
changeset as it cannot by itself bring more mess that I *may* (or not)
already have brought with previous pushes.
2004-06-24 14:42:56 +02:00
sergefp@mysql.com
e4270dd595
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-root
2004-06-24 15:52:52 +04:00
ram@gw.mysql.r18.ru
8ba7841740
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198
2004-06-24 16:52:51 +05:00
mskold@mysql.com
075d71d546
Modified index flags and added ndbcluster_print_error
2004-06-24 12:04:22 +02:00
guilhem@mysql.com
4a82bd4732
Final part of WL#1717 "innodb/binlog consistency". This is to resolve
...
a limitation of yesterday's implementation:
if there was an unfinished transaction (COMMIT not typed), and some MyISAM tables were
then updated, and then mysqld crashes, then at restart the server would use the too old
binlog offset known by InnoDB to cut the binlog, thus cutting the successful MyISAM
updates. We fix this by reporting the binlog offset into InnoDB even if InnoDB was not
affected at all by the update.
But the feature is still disabled until we decide if it can go into 4.1.3.
2004-06-24 11:38:57 +02:00
ram@gw.mysql.r18.ru
21018e3420
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198
2004-06-24 14:33:36 +05:00
guilhem@mysql.com
7480ef3840
disabling the --innodb-safe-binlog option. It should be fixed to work with MyISAM too,
...
before being available to users. That will be the case in 4.1.4.
The "bk commit in mysqldoc" corresponding to this feature was not pushed.
Removing the 6 tests, they'll be pushed again later.
2004-06-24 01:06:48 +02:00
dlenev@brandersnatch.localdomain
a58930d562
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
2004-06-24 01:55:51 +04:00
guilhem@mysql.com
bccf57fbb2
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-06-23 23:52:49 +02:00
guilhem@mysql.com
c267b19db2
WL#1717 "binlog/innodb consistency".
...
Final push. Printing some warnings at startup, as --innodb-safe-binlog requires
some other options, to work as expected.
Adding 6 new tests (3 pairs). If they fail on some platforms (so far they have been run only on my Linux),
they should be ignored for the 4.1.3 build (you can just
rm mysql-test/*/rpl_crash_*).
Now going to update doc.
2004-06-23 23:51:40 +02:00
dlenev@brandersnatch.localdomain
afa211f57b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
2004-06-24 01:42:43 +04:00
serg@serg.mylan
d5808281e6
followup
2004-06-23 23:41:56 +02:00
dlenev@brandersnatch.localdomain
0d78aa2c55
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
2004-06-24 01:09:05 +04:00
dlenev@brandersnatch.localdomain
ab8a72c7c7
Fixed compilation on windows.
2004-06-24 01:08:07 +04:00
serg@serg.mylan
2c48e052d9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-23 21:47:07 +02:00
serg@serg.mylan
9f45c9e399
followup to handler cleanup
2004-06-23 21:26:34 +02:00
lenz@mysql.com
79739b30e2
- fixed a compile error on Windows (incompatible cast)
2004-06-23 16:57:34 +02:00
monty@mysql.com
cd049201f6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-23 17:13:27 +03:00
serg@serg.mylan
cfd7859565
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-23 16:13:26 +02:00
bar@mysql.com
b42fc1e77c
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-06-23 19:13:26 +05:00
gluh@gluh.mysql.r18.ru
3bcbdcb406
Fix for bug#3950: Check/Repair caused by "Field List" doesn't show table name in processlist
2004-06-23 18:13:25 +04:00
monty@mysql.com
d0507ca7f3
Fixed warning about unitialized mutex when mysqld couldn't start.
2004-06-23 16:39:56 +03:00
bar@mysql.com
97bdd97c8a
log.cc:
...
rpl_charset failed on Linux/AMD64.
2004-06-23 18:34:26 +05:00
serg@serg.mylan
c03addab79
merged
2004-06-23 12:36:07 +02:00
serg@serg.mylan
3f1c4ba745
handler interface cleanups:
...
more logical table/index_flags
return HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
max_keys and other limits renamed to max_supported_keys/etc
max_keys/etc are now wrappers to max_supported_keys/etc
ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing
2004-06-23 12:29:05 +02:00
dlenev@brandersnatch.localdomain
60404d2c37
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-am
2004-06-23 13:07:33 +04:00
dlenev@brandersnatch.localdomain
47e03a0099
Final solution to mysql_tzinfo_to_sql problem.
2004-06-23 13:07:00 +04:00
ram@gw.mysql.r18.ru
382ed47f5b
A fix (Bug #4237 : Server crash with a subquery SELECT).
...
Original test case was too big to add it.
Unfortunately I didn't manage to reduce it.
2004-06-23 13:40:59 +05:00
sergefp@mysql.com
9c2a961a63
Fix and test case for BUG#3899
2004-06-23 11:40:42 +04:00
pem@mysql.com
97caae5109
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/pem/work/mysql-4.1
2004-06-23 09:07:14 +02:00
dlenev@brandersnatch.localdomain
c110ec1a22
Fix for build from bk failures with old automake.
...
mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made
compatible with older automake versions.
2004-06-22 23:36:26 +04:00
pem@mysql.comhem.se
34ddd9c515
Fixed BUG#3486: FOUND_ROWS() fails inside stored procedure [and prepared statement].
2004-06-22 19:38:07 +02:00
dlenev@brandersnatch.localdomain
b20dca925d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4200
2004-06-22 19:28:01 +04:00
dlenev@brandersnatch.localdomain
eea19e5235
Fix for Bug# 4200 "Parse error on LIKE ESCAPE with parameter binding"
...
Now ESCAPE in LIKE will accept not only string literal but constant
delimited expression.
2004-06-22 19:27:16 +04:00
bell@sanja.is.com.ua
e71b693115
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-regexp-4.1
2004-06-22 15:17:40 +03:00
bell@sanja.is.com.ua
5ed07df98a
Merge
2004-06-22 13:48:51 +03:00
ram@gw.mysql.r18.ru
dc6465cc38
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4102
2004-06-22 15:41:51 +05:00
ram@gw.mysql.r18.ru
f3d11147c9
after merge fix
2004-06-22 14:48:29 +05:00
bell@sanja.is.com.ua
cb0f607c5e
Merge
2004-06-22 12:38:23 +03:00
dlenev@brandersnatch.localdomain
4f8294f2ff
Removed building of test_time test since it was not needed/used really and caused problems
...
on many platforms (the other option was providing portable setenv() replacement).
2004-06-22 13:19:25 +04:00
konstantin@mysql.com
3f53a1cb44
Fix for bug#4236 "Server crash on attempt to execute non-prepared
...
statement": check that statement is not null when accessing it's name.
2004-06-22 11:04:41 +04:00
ram@gw.mysql.r18.ru
b929db876d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198
2004-06-22 10:58:16 +05:00
sergefp@mysql.com
72d8f71f54
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-root
2004-06-22 05:11:59 +04:00