Commit graph

3440 commits

Author SHA1 Message Date
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
monty@mysql.com
93f3d4c020 Updated result sets (from 4.1) 2004-07-09 02:03:19 +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
bell@sanja.is.com.ua
ce5caec189 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-07-08 13:59:53 +03:00
bar@mysql.com
d2076ae8d5 Minor fix: V is primary level, not U. 2004-07-08 15:19:26 +05:00
bell@sanja.is.com.ua
a0ae383cbf Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work2-4.1
2004-07-08 13:18:57 +03: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
206e642588 results fixed 2004-07-08 10:11:30 +02: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
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
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
lenz@mysql.com
b5c6ced1aa - fixed typo in mysql-test/ndb/ndbcluster.sh that caused a
"test: argument expected" error when trying to run the NDB test
   suite on Solaris
2004-07-05 07:48:09 +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
41bd6aa4b6 do not assign values of left expression of IN/ANN/ANY subquery in case of PS preparation (BUG#4403) 2004-07-04 10:40:24 +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
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
a99468259b after merge fix 2004-06-28 11:06:22 +02: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
konstantin@mysql.com
172ab0ab8b Fix for 'make dist' 'make distclean' goals work even if ./configure
called without NDB enabled.
2004-06-25 23:21:14 +04: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
serg@serg.mylan
3ba6fd97b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 15:12:51 +02:00
serg@serg.mylan
3b59dd1bd0 bug#4008 - merge table cannot determine what key caused "dupl. key" error 2004-06-25 15:12:13 +02:00
ingo@mysql.com
8db6c064df Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2686
2004-06-25 14:44:37 +02:00
bell@sanja.is.com.ua
74b01ca387 type of parameter assignment for parameters from variables added (BUG#4280) 2004-06-25 15:16:00 +03:00
bell@sanja.is.com.ua
6e1eb6a78c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
2004-06-25 14:48:15 +03:00
ingo@mysql.com
57da928039 Merge 2004-06-25 12:59:47 +02:00
ingo@mysql.com
958cf857a3 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug3565
2004-06-25 12:14:54 +02:00
serg@serg.mylan
3452445559 remove ^M's
compile even without InnoDB
2004-06-25 11:33:03 +02:00
bell@sanja.is.com.ua
4092635155 fixed EXPLAIN behaviour with prepared statements (BUG#4271) 2004-06-25 11:37:43 +03:00
serg@serg.mylan
37314708b7 merged 2004-06-24 23:29:28 +02:00