Commit graph

18611 commits

Author SHA1 Message Date
jimw@mysql.com
481f763255 Merge mysql.com:/home/jimw/my/mysql-4.1-9500
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-10 14:44:25 -07:00
reggie@mdk10.(none)
6271cf51ac Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/41test3
2005-06-10 14:17:32 -05:00
lenz@mysql.com
abaae49cfd Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-4.1-build
2005-06-10 15:37:21 +02:00
lenz@mysql.com
a610a7749f - added missing files std_data/server-cert.pem and std_data/server-key.pem to make
the SSL tests pass
2005-06-10 15:30:16 +02:00
jimw@mysql.com
21f46b3940 Merge mysql.com:/home/jimw/my/mysql-4.1-11122
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:03:55 -07:00
jimw@mysql.com
bb8f2663ae Merge mysql.com:/home/jimw/my/mysql-4.1-10566
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:03:18 -07:00
jimw@mysql.com
3c425f1f65 Merge mysql.com:/home/jimw/my/mysql-4.1-10931
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:02:04 -07:00
svoj@mysql.com
a3e72ec85a Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/var/tmp/sslbug/mysql-4.1
2005-06-09 21:22:44 +05:00
acurtis@xiphis.org
cb7961bd9b Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into xiphis.org:/usr/home/antony/work2/p1-bug11028.3
2005-06-09 16:44:03 +01:00
acurtis@xiphis.org
304bb0c66d Bug#11028 Crash on create table like
Report error instead of crashing
2005-06-09 16:06:15 +01:00
reggie@mdk10.(none)
68c6470acf Bug #8183 MERGE and SYM cause wrong SHOW CREATE TABLE
Without this patch, all file elements in info have symlink resolved
pathnames.  This means append_create_info does not  have any way
of showing the correct database name when a symlinked database is used.
2005-06-09 09:00:51 -05:00
konstantin@mysql.com
6a5b215443 Fix broken test suite. 2005-06-09 18:00:50 +04:00
gluh@mysql.com
f183ee49eb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1
2005-06-09 15:26:46 +05:00
joreland@mysql.com
7d5960a5a6 update result file for ps7_ndb 2005-06-09 12:26:45 +02:00
gluh@eagle.intranet.mysql.r18.ru
8574ed6fc6 Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
generate proper error message if we use SET ... = NULL for 'set'
  variables
2005-06-09 14:39:29 +05:00
joreland@mysql.com
cce5aea0c7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-09 11:37:10 +02:00
ramil@mysql.com
90ddbe87d6 a fix (bug #11193: error messages gets garbled after reggies latest changeset: ChangeSet@1.2260.1.). 2005-06-09 13:13:02 +05:00
joreland@mysql.com
5c9dee551a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-09 08:12:14 +02:00
joreland@mysql.com
a5a13ea8c8 ndb - autotest
small script fixes
  - Don't use hostname -s as it's linux specific
  - Don't remove result unless scp worked
2005-06-09 08:07:48 +02:00
joreland@mysql.com
3765bb2df9 ndb - uint overflow when running on 64-bit platform with more than 4Gb of mem
bug#10711
bug#10058
bug#9363
bug#9025
bug#8918
2005-06-09 07:49:48 +02:00
jimw@mysql.com
927418b199 Make sure we don't mistake a "grep mysqld" for a mysqld process
when checking if the server is running in mysqld_safe. (Bug #11122)
2005-06-08 18:57:39 -07:00
jimw@mysql.com
495ee34be0 Fix problem with handling of lower_case_table_name == 2 when
the case in the FROM and WHERE clauses didn't agree. (Bug #9500)
2005-06-08 14:35:16 -07:00
svoj@mysql.com
f9751e1785 Merge mysql.com:/var/tmp/sslbug/mysql-4.0
into mysql.com:/var/tmp/sslbug/mysql-4.1
2005-06-08 21:40:58 +05:00
svoj@mysql.com
cc31c4c7fb Fix for
BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
Remove obsolete code.
2005-06-08 21:07:25 +05:00
joreland@mysql.com
dc78a77206 bug#11166 - ndb
Fix potential inconsistency when running ndb_restore due to faulty parsing
    of backup log wrt inserts
2005-06-08 16:48:57 +02:00
reggie@mdk10.(none)
e23f249187 improved mapping from numerical open codes to string fopen codes.
This was necessary because the old code would return 
"w+" for O_RDONLY|O_SHARE for example.
2005-06-07 15:45:03 -05:00
reggie@mdk10.(none)
f86c44ff56 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/41test3
2005-06-07 15:45:02 -05:00
serg@serg.mylan
b95c7afcda Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-06-07 22:45:01 +02:00
serg@serg.mylan
30d81b75ff bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
check table->file->inited to catch incorrect calling sequence.
2005-06-07 22:43:25 +02:00
monty@mysql.com
eb9e5777ee Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-06-07 18:23:04 +03:00
igor@rurik.mysql.com
5514c94865 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-07 06:48:21 -07:00
igor@rurik.mysql.com
d3f3cc617d Many files:
Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
2005-06-07 06:34:13 -07:00
monty@mysql.com
543691ab15 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2005-06-07 16:34:10 +03:00
joreland@mysql.com
e6dfe6aa36 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-06-07 15:25:21 +02:00
joreland@mysql.com
e697ec1c1c bug#11133 - ndb
incorrect handling of writeTuple with multi op transaction
2005-06-07 15:10:57 +02:00
monty@mysql.com
47c3261375 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-06-07 15:42:35 +03:00
monty@mysql.com
1c725ff797 Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
Fix instead wrong call to ha_key_cmp
This is related to bug #10741 Inserting double value into utf8 column crashes server
2005-06-07 15:09:49 +03:00
igor@rurik.mysql.com
6cc77486b7 item_buff.cc:
Removed an extra space char.
2005-06-07 04:21:19 -07:00
igor@rurik.mysql.com
6244353c2a Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-06-07 03:12:12 -07:00
igor@rurik.mysql.com
90dd86907e sql_select.cc, item_buff.cc, item.h:
Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB field.
  Now the size of the buffer is limited by max_sort_length.
group_by.test, group_by.result:
  Added a test case for bug #11088.
2005-06-07 03:05:57 -07:00
lenz@mysql.com
a411763dae Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-06-07 11:41:55 +02:00
elliot@mysql.com
fe84398b9f Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
into  mysql.com:/Users/emurphy/src/work/mysql-4.1
2005-06-07 05:10:56 -04:00
elliot@mysql.com
2a1f5c0748 Accepted openlogging 2005-06-07 05:10:18 -04:00
lenz@mysql.com
ece01f6937 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-06-07 11:03:01 +02:00
bar@mysql.com
093573b6b7 Bug#10253: compound index length and utf8 char set
produces invalid query results

mi_key.c:
  well_formed_length should be executed before space trimming, not after.
ctype_utf8.test:
ctype_utf8.result:
  adding test.
2005-06-07 13:56:42 +05:00
lenz@mysql.com
1c21f84afb - BUG#10676: don't install "make_win_src_distribution" and "make_win_binary_distribution"
when doing "make install" (they are not needed/useful) outside the build tree. Added
  "mysql_client_test" to the "MySQL-bench" RPM.
- some small RPM spec file improvements (more variables than hard-coded values, cleanups)
2005-06-07 10:25:51 +02:00
stewart@mysql.com
09212cc790 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-06-07 12:33:36 +10:00
elliot@mysql.com
b906f31388 BUG#7967 Fix mysqlhotcopy --record-log-position 2005-06-06 22:17:16 -04:00
bar@mysql.com
abb2d7aa34 ctype_cp1250_ch.result, ctype_cp1250_ch.test:
Adding test.
ctype-win1250ch.c:
  Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
  Wrong min_sort_char fix.
2005-06-06 21:22:23 +05:00
mronstrom@mysql.com
6a376bec64 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/Users/mikron/bug10901
2005-06-06 10:42:11 +02:00