61a365e696
more sys_var_str fixes
2004-03-20 17:08:01 +01:00
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
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
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
581996393a
select @@smth=@@sys_str_var crash fixed
2004-03-20 14:36:00 +01:00
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
b6e5c23c26
Ensure that we use unix file format (no \r\n) for all new files
...
Portability fixes
2004-03-20 12:48:14 +02:00
82c79134b0
merge with 4.0 to get portability fixes
2004-03-19 18:35:49 +02:00
b49b24d94a
Added test to show bug in current union implementation
...
After merge fixes
Portability fixes
2004-03-19 18:33:38 +02:00
9a1baf7d62
Portability fixes
...
Fixed some wrong column specifications in mysql_fix_privilege_tables
2004-03-19 18:26:02 +02:00
13946359c6
DROP DATABASE now returns (affected_rows) number of tables dropped
2004-03-19 16:43:03 +01:00
933278a52b
merge with 4.0 (to get compiler error fixes for innodb)
2004-03-19 15:17:56 +02:00
f375eb50f8
Removed \r
2004-03-19 15:03:12 +02:00
b7fc7188d0
Portability fixes
...
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work
2004-03-19 14:52:48 +02:00
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
66631a3c1e
Bug #3087 CONCAT_WS makes the server die in case of illegal mix of collations
2004-03-19 12:09:14 +04:00
f897144c4e
Bug #2821 Table default character set affects LONGBLOB fields
2004-03-19 11:37:49 +04:00
32feac3093
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2004-03-18 19:31:06 +02:00
244304fdbb
Fix for BUG#3204 ""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs":
...
we now detect that the server is sending us a log which we did not request
by testing the info in the fake Rotate event.
I also changed code to not print the fake Rotate which describes the
log we asked for (it's always the first received event but old masters
may not send it).
2004-03-18 19:29:07 +02:00
e93b933ade
Fix for #3188
2004-03-18 16:49:48 +04:00
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
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
19d0a60eca
Don't change server suffix if given to configure
...
Portability fixes
2004-03-18 01:48:46 +02:00
53c810cda4
merge fixes (use old code)
2004-03-18 00:16:04 +02:00
f34a642d6e
after merge fixes
2004-03-18 00:09:13 +02:00
b28a13c028
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
2004-03-17 21:04:49 +04:00
b42746f7eb
fixed structure error from last merge for bug #2874
2004-03-17 21:01:07 +04:00
99d374159a
merge
2004-03-17 18:57:51 +04:00
bdd70d1cfd
Added test case for the bug #3155 : strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
...
(thankee Monty)
2004-03-17 18:43:58 +04:00
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
84e04c74c5
Fix for bug#3086: SHOW GRANTS doesn't follow ANSI_QUOTES
2004-03-17 16:19:09 +04:00
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
91d5e55a90
Fix for #233
...
test for IGNORE added
2004-03-17 14:03:26 +04:00
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
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
f9ad650490
merge with 4.0
2004-03-17 10:36:12 +02:00
350b433569
merge with 4.0
2004-03-16 22:41:30 +02:00
8a1675c869
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-16 20:55:51 +02:00
293bb8fee7
merge
2004-03-16 20:23:07 +02:00
579a94a328
after review & some other fixes
2004-03-16 20:19:36 +02:00
eb6f68ec9a
uuid() tests
2004-03-16 16:35:53 +01:00
49e9b153ff
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-16 16:35:52 +01:00
b8c065c527
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-16 17:35:50 +02:00
c9938b9dff
merge
2004-03-16 17:35:49 +02:00
ceec63f18a
EOVERFLOW moved to my_base.h - it is used not only in strtod.c
...
error message corrected
2004-03-16 16:35:47 +01:00
28b8501326
after merge fix
2004-03-16 16:30:10 +02:00
cd5c30c5dc
fix test during merge
2004-03-16 16:30:09 +02:00
96a9d0da52
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-16 16:30:08 +02:00
b206f29e6c
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-03-16 15:14:12 +02:00
df842c2fc3
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-16 17:14:11 +04:00
