guilhem@mysql.com
324ff6dedf
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-10-08 20:53:07 +02:00
monty@narttu.mysql.fi
d37a5c4dd7
Indentation cleanups
...
Remove wait_if_global_read_lock on commit as this can cause deadlocks
2003-10-08 21:50:05 +03:00
paul@ice.snake.net
8e7aa7f875
Incorporate Stefan's new translations of German error messages.
2003-10-08 12:51:10 -05:00
monty@narttu.mysql.fi
dc6f07256c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-10-08 18:55:34 +03:00
monty@narttu.mysql.fi
9e57c12b5a
Fixed bug in error handling of CREATE ... SELECT
...
More tests cases
After merge fixes
2003-10-08 18:53:31 +03:00
bell@laptop.sanja.is.com.ua
afac13d033
Some simple optimisation
...
= ANY and <> ALL converted to (NOT) IN to get advantage of IN optimisation
2003-10-08 17:40:54 +03:00
lenz@kallisto.local
ce9c9845a1
- portability fix: replaced "uint" with "unsigned int"
2003-10-08 13:26:29 +02:00
lenz@kallisto.local
2379030676
- added missing link line that seemed to have gone lost during the last
...
4.0->4.1 merge (mysqltest needs to be linked with a C++ compiler)
2003-10-08 13:06:47 +02:00
lenz@mysql.com
75e74c79ec
Merge
2003-10-08 12:49:42 +02:00
lenz@mysql.com
4bc3f12caf
- added make_sharedlib_distribution.sh to the source distribution
2003-10-08 12:35:24 +02:00
monty@narttu.mysql.fi
246febee42
merge with 4.0 to get fix for mysqlbinlog
2003-10-08 12:05:27 +03:00
monty@narttu.mysql.fi
d9ff665102
Fixes after merge
2003-10-08 12:01:58 +03:00
bell@laptop.sanja.is.com.ua
381b680868
fixed error handling in SET and DO operators (BUG#1484)
2003-10-08 11:19:09 +03:00
monty@narttu.mysql.fi
d00d9110ba
Fixed test case that my last patch to mysqlbinlog broke.
...
Changed --remote to --read-from-remote-server (mysqlbinlog)
2003-10-08 10:23:54 +03:00
bell@laptop.sanja.is.com.ua
9b4018066e
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
2003-10-08 08:50:57 +03:00
bar@bar.mysql.r18.ru
c5c4e31545
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-10-08 10:19:25 +05:00
bar@bar.mysql.r18.ru
9023009ae3
query_cache.result, query_cache.test:
...
Character set variables test
2003-10-08 10:18:38 +05:00
greg@mysql.com
7a6239640f
Fixed test case to work on NetWare.
2003-10-08 00:19:44 -04:00
monty@narttu.mysql.fi
02ad66f32e
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-10-08 01:30:31 +03:00
monty@narttu.mysql.fi
a278a77475
Fix for option 'R' (connect to remote server) in mysqlbinlog
2003-10-08 01:30:10 +03:00
guilhem@gbichot2
528b082705
mysql_real_connect picks the Unix login when the user "" is used.
...
This makes the test non-repeatable when running as root.
So I change to not use the "" user, but a random string which will
always result in the @localhost user being selected by the server.
2003-10-07 23:15:13 +02:00
serg@serg.mylan
9d198d35bf
merged
2003-10-07 20:41:07 +02:00
monty@narttu.mysql.fi
359d40f2f5
merge
2003-10-07 21:41:07 +03:00
guilhem@mysql.com
ed5d059202
Fix for a test failure with the standard (no-BDB) binary:
...
as the test is meaningful only if the slave supports transactions,
we require this. As in 4.0 the slave runs with --skip-innodb, we
test for BDB.
2003-10-07 20:41:06 +02:00
monty@narttu.mysql.fi
1f8e38d03a
Merge with 4.0 to get fix for mysqlbinlog
2003-10-07 21:41:06 +03:00
monty@narttu.mysql.fi
1b06af3a97
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-10-07 21:41:05 +03:00
vva@eagle.mysql.r18.ru
16b8fd8ece
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
2003-10-07 14:41:04 -04:00
bell@laptop.sanja.is.com.ua
1324a97f63
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
2003-10-07 21:01:57 +03:00
bell@laptop.sanja.is.com.ua
69c206915f
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1
2003-10-07 19:20:51 +03:00
bell@laptop.sanja.is.com.ua
7921834334
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1
2003-10-07 17:42:59 +03:00
bell@laptop.sanja.is.com.ua
e99441b045
after merge fix
2003-10-07 17:37:20 +03:00
heikki@hundin.mysql.fi
6112853cda
Many files:
...
Multiple tablespaces for InnoDB
sql_table.cc:
Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql_update.cc, sql_select.cc, my_base.h:
More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
2003-10-07 17:28:59 +03:00
bell@laptop.sanja.is.com.ua
862ff0ed1c
fixed error detection
2003-10-07 16:26:46 +03:00
bell@laptop.sanja.is.com.ua
efae22f617
merge
2003-10-07 16:22:48 +03:00
monty@narttu.mysql.fi
b82b76f480
Simple cleanups
2003-10-07 15:44:31 +03:00
monty@narttu.mysql.fi
6056cfadfc
Merge with 4.0.16
2003-10-07 15:42:26 +03:00
monty@narttu.mysql.fi
0091fa2e32
Fixed bug in sub select after last merge
2003-10-07 14:04:59 +03:00
bell@laptop.sanja.is.com.ua
09c139ac37
after merge fix
2003-10-07 13:31:44 +03:00
monty@narttu.mysql.fi
4b491cb788
Simple optimization
2003-10-07 13:26:56 +03:00
monty@narttu.mysql.fi
b31a79df3e
merge
2003-10-07 11:24:38 +03:00
ram@gw.mysql.r18.ru
cb334d03f4
WL #562 : Change format of slow log in 4.1
2003-10-07 12:05:35 +05:00
bell@laptop.sanja.is.com.ua
d5a7a6ec34
merge
2003-10-07 08:51:09 +03:00
bell@laptop.sanja.is.com.ua
dfb7ca08dc
merge
2003-10-07 07:51:14 +03:00
bell@laptop.sanja.is.com.ua
5b13ec47dd
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 02:20:23 +03:00
monty@narttu.mysql.fi
73cb1a52d2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-10-07 01:59:14 +03:00
bell@laptop.sanja.is.com.ua
18bb43671d
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 01:31:16 +03:00
bell@laptop.sanja.is.com.ua
ccaeb61f8b
after merge fix
2003-10-07 01:28:15 +03:00
monty@narttu.mysql.fi
8c0b7d5d97
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-10-07 00:34:43 +03:00
monty@narttu.mysql.fi
446d40e880
After merge fixes
2003-10-07 00:23:29 +03:00
monty@mishka.mysql.fi
53fa223ed6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-06 22:57:04 +03:00
