Commit graph

2970 commits

Author SHA1 Message Date
serg@serg.mylan
8d080cbcfa manual merge 2004-07-20 15:34:57 +02:00
serg@serg.mylan
9de748d1d3 results fixed after merge 2004-07-20 11:00:10 +02:00
serg@serg.mylan
1f0cd873c5 manual merged (blame me!) 2004-07-20 00:53:24 +02:00
guilhem@mysql.com
e5c2285782 Fix for BUG#4551 "Temporary InnoDB tables not replicated properly with CREATE TABLE .. SELECT"
The problem was that (for any storage engine), the created temporary table was not removed if CREATE SELECT failed (because
of a constraint violation for example). This was not consistent with the manual and with CREATE SELECT (no TEMPORARY).
2004-07-18 14:34:35 +02:00
guilhem@mysql.com
37bf41a7ae Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-07-17 17:10:52 +02:00
guilhem@mysql.com
88e00cd919 Fixes for
BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines",
BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table" with a test file.
It was not possible to add a test for BUG#4506 as in the test suite we must use --short-form
which does not display the "# at" lines.
2004-07-17 16:58:16 +02:00
bell@sanja.is.com.ua
67de5c37ff 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-07-16 15:45:06 +03:00
bell@sanja.is.com.ua
9336d36cf8 VIEW
two TABLE_LIST copy eliminated
2004-07-16 01:15:55 +03:00
marko@hundin.mysql.fi
20b60510e9 InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADE
(Bug #4446)
2004-07-15 15:46:22 +03:00
bell@sanja.is.com.ua
8ab5398bf7 check that all system tables deleted added 2004-07-15 14:17:30 +03:00
monty@mysql.com
b97ef911c5 Merge 2004-07-15 04:28:42 +03:00
monty@mysql.com
5b3c418b48 After merge fixes
Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)

Sanja needs to check out the calling of close_thread_tables() in sp_head.cc
2004-07-15 04:19:07 +03:00
monty@mysql.com
31fe2837f9 Merge with 4.1 2004-07-12 08:20:24 +03:00
monty@mysql.com
07808113d6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-07-09 10:55:47 +03:00
monty@mysql.com
c1032fe9eb Cleanup of db option cacheing
Some bug fixes to last pushed code
2004-07-09 10:55:16 +03:00
monty@mysql.com
064b8b8f65 Merge with 4.0 to get bug fixes 2004-07-09 02:29:28 +03:00
bar@mysql.com
6c996daa91 Bug#4338: mysql-test-run fails if compiled with non-latin1 character set 2004-07-08 18:54:07 +05:00
bar@mysql.com
a5025f4ca6 WL#807 Optimize loading database options in load_db_opt
also known as
BUG#2326 Charset of table is determined by charset of db only if "USE db;"
2004-07-08 15:03:01 +05:00
serg@serg.mylan
d0f53f7ee0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-07 23:51:25 +02:00
serg@serg.mylan
fe57b75079 bug#4441 - crash in UNHEX(NULL) 2004-07-07 23:49:03 +02:00
vva@eagle.mysql.r18.ru
bd3f745707 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-5.0
into eagle.mysql.r18.ru:/home/vva/work/WL_1941/mysql-5.0
2004-07-07 17:36:10 +05:00
vva@eagle.mysql.r18.ru
e9e5b3547e patch for task WL 1941 "NO_C_ESCAPE sql_mode" 2004-07-07 17:26:43 +05:00
bar@mysql.com
6fdafa5635 Don't allow badly formed UTF8 identitiers 2004-07-07 16:39:43 +05:00
bar@mysql.com
aa679b62c0 Adding Roman (classical Latin) collation. 2004-07-07 15:20:23 +05:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
serg@serg.mylan
d8dabe43fb Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 16:30:04 +02:00
serg@serg.mylan
021242bc6c mysql_fix_privilege_tables.sh:
various fixes (for mysql-test-run at least):
  * accept --no-defaults
  * 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --)
ps_3innodb.test:
  only run ps_3innodb.test if innodb is present
mysql-test-run.sh:
  it's --verbose, not --verbose=1
2004-07-06 16:29:26 +02:00
bar@mysql.com
30a86a0be9 Bug#4417 binary character set breaks multi-byte table/field name. 2004-07-06 17:15:43 +05:00
bar@mysql.com
434e2e094c rpl_charset.result, rpl_charset.test:
An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.
2004-07-06 13:43:15 +05:00
gordon@zero.local.lan
b437a2f3c9 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into zero.local.lan:/GORDON/MySQL/mysql-4.1/src
2004-07-05 10:08:38 +02:00
joreland@mysql.com
d0aa80a698 Fix mysql-test-run ndb order by/endian issue 2004-07-05 07:14:45 +02:00
bell@sanja.is.com.ua
130740248b aggregate functions check during substitution made only for single row subselects (BUG#4400)
restoring current senect pointer before PS rexecution (backport from 5.0)
removed spaces at  lines ends
2004-07-04 08:46:28 +03:00
bell@sanja.is.com.ua
1b54d08a1c right join print fixed 2004-07-03 01:08:46 +03:00
gordon@zero.local.lan
c87812d8e6 Added comments to the PS test files, to prevent modifications which may destroy the tests . 2004-07-02 20:01:34 +02:00
bar@mysql.com
4df5a14a6f Bug #4374 SHOW TABLE STATUS FROM ignores collation_connection 2004-07-02 16:52:02 +05:00
bell@sanja.is.com.ua
ce19102645 fixed join_nested test independence of environment
spaces at line end in fresh definitions removed
fixed printing of nested joins (BUG#4352)
2004-07-01 23:46:43 +03:00
gordon@zero.local.lan
8462b8aeb8 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into zero.local.lan:/GORDON/MySQL/mysql-4.1/src
2004-07-01 16:35:52 +02:00
gordon@zero.local.lan
7071d062c9 WL#1564 Intensive test of prepared statements via 'mysqltest' 2004-07-01 16:30:29 +02:00
monty@mysql.com
78c1938848 Portability fixes (For Netware) 2004-07-01 17:26:45 +03:00
ram@gw.mysql.r18.ru
6acd105b16 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4089
2004-06-29 13:51:35 +05:00
ram@gw.mysql.r18.ru
c0c1c3200a a fix (bug #4304: TRUNCATE <table of type BDB> , wrong result). 2004-06-29 13:49:50 +05:00
vva@eagle.mysql.r18.ru
e228547a61 s/\r\n/\n/ in mysql-test/*/system_mysql_db*
according to http://www.bitkeeper.com/Documentation.FAQS.Windows_NT.html
2004-06-28 15:53:49 +05:00
serg@serg.mylan
cb188a89c1 after merge fix 2004-06-27 13:16:19 +02:00
serg@serg.mylan
f941f842c3 make lowercase_table3 to work 2004-06-27 11:57:08 +02:00
serg@serg.mylan
3236093b8b removed using lex->select_lex.options is SHOW TABLE [STATUS] commands (BUG#4288) 2004-06-27 00:34:05 +02:00
serg@serg.mylan
a5c8b3ee59 correct eq() method for Item_param (BUG#4233) 2004-06-26 23:55:38 +02:00
serg@serg.mylan
450e5b0119 after merge fixed 2004-06-26 14:21:32 +02:00
monty@mysql.com
8c867328cd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-25 21:56:42 +03:00
monty@mysql.com
b1d08ba2b4 Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
bell@sanja.is.com.ua
45411ca0b5 merge 2004-06-25 18:33:31 +03:00