Commit graph

17714 commits

Author SHA1 Message Date
igor@rurik.mysql.com
6540c59808 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-03-09 13:24:05 -08:00
igor@rurik.mysql.com
4406118cf8 func_str.result:
Correction after manual merge.
2005-03-09 13:20:52 -08:00
igor@rurik.mysql.com
af5d21357e Manual merge 2005-03-09 10:58:52 -08:00
heikki@hundin.mysql.fi
2ec7c5f447 log0recv.c:
Better ibbackup message
  Add a message explaining why we do a 'crash recovery' after an ibbackup restore; suggested by Tim Smith
2005-03-09 20:32:01 +02:00
lars@mysql.com
44412afa2a Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1 2005-03-09 19:32:00 +01:00
lars@mysql.com
5f931f472f Fix to make mysql-test-run.pl work with new system tables definitions 2005-03-09 19:21:57 +01:00
timour@mysql.com
f489e56291 Fix for BUG#7425.
The reported problems were due to two completely unrelated omissions.
1) The file sort procedure didn't correctly create the sort key in
   make_sortkey when the sortkey was an unsigned integer.
2) The name resolution procedure for column references inside a HAVING
   clause did not propagate the unsigned_flag of the resolved references.
This patch corrects both problems.
2005-03-09 16:51:03 +02:00
kent@mysql.com
3ce3295e3f mysqldumpslow.sh:
bug#4914 added --help and usage information
2005-03-09 15:00:40 +01:00
serg@serg.mylan
6121422820 sql/mysqld.cc
preserve backward compatibility
2005-03-09 13:41:57 +01:00
serg@serg.mylan
c64b47fc0e Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-09 13:01:39 +01:00
serg@serg.mylan
0279cd50d9 myisam/myisam_ftdump.c
recalculate stats/gws for the last word in the index too
    remove unused code
2005-03-09 12:59:20 +01:00
igor@rurik.mysql.com
4559fb998b func_str.result, func_str.test:
Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.
2005-03-09 00:15:51 -08:00
joreland@mysql.com
241c5e1046 bug#9052 - ndb - Use correct length during unique index build
(recommit as 4.1->5.0 merge is not possible)
2005-03-09 07:49:03 +01:00
kent@mysql.com
73eea6dde9 configure.in:
bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists
2005-03-09 02:53:00 +01:00
kent@mysql.com
c6002966be mysql-test-run.pl:
Removed -c from /bin/sh call
make_win_src_distribution.sh:
  Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
2005-03-09 01:34:22 +01:00
marko@hundin.mysql.fi
fa001505e3 mysqld.cc:
main(): add missing parameter to printf(ER(ER_READY),...) call
2005-03-08 22:33:11 +02:00
serg@serg.mylan
eb0fc8ff28 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 21:33:10 +01:00
paul@kite-hub.kitebird.com
3a81683c05 changelog-4.1.xml:
Add dummy changelog file. It should merge upward without conflict.
2005-03-08 13:13:15 -06:00
serg@serg.mylan
5a2c426eb8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 19:47:49 +01:00
serg@serg.mylan
9272081ebb BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
for fulltext searches too
2005-03-08 19:45:55 +01:00
marko@hundin.mysql.fi
2bfe884320 dict0load.c:
dict_load_table(): Do not complain about mix_len != 0,
  because MySQL 3.23.4x left garbage in that column.
2005-03-08 20:06:09 +02:00
Sinisa@sinisa.nasamreza.org
172294e92e Fix to make builds possible 2005-03-08 20:06:08 +02:00
paul@kite-hub.kitebird.com
323d135684 changelog-4.0.xml:
Fix bad root element name in DOCTYPE.  Sheesh.
2005-03-08 11:49:56 -06:00
paul@kite-hub.kitebird.com
5db38fb7de Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
2005-03-08 10:44:16 -06:00
paul@kite-hub.kitebird.com
e3d32c9e2d Add dummy changelog file. It should merge upward without conflict. 2005-03-08 10:43:44 -06:00
jani@ua141d10.elisa.omakaista.fi
633f50cbef Added possibility to add disabled tests to mysql-test-run. 2005-03-08 18:32:31 +02:00
jani@ua141d10.elisa.omakaista.fi
a9c062eba0 Netware build environment script related patch. 2005-03-08 18:18:53 +02:00
marko@hundin.mysql.fi
48cd94d9ae After merge fixes 2005-03-08 17:18:27 +02:00
marko@hundin.mysql.fi
63d01ae103 dict0load.c:
dict_load_table(): Remove the check for row_format=compact for now,
  because the flag bit we used (high-order bit of mix_len)
  has not been zero for at least two customers.
2005-03-08 17:08:17 +02:00
joreland@mysql.com
c66c2a747f bug#9052 - ndb - Use correct length during unique index build 2005-03-08 15:26:34 +01:00
marko@hundin.mysql.fi
4fe94704a7 Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-08 16:02:13 +02:00
joerg@mysql.com
f661655527 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-03-08 14:43:06 +01:00
marko@hundin.mysql.fi
f8120d641c Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-03-08 15:33:30 +02:00
joerg@mysql.com
a67b670a08 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1 2005-03-08 14:30:17 +01:00
joerg@mysql.com
e09e0a154a Post-merge manual fix. 2005-03-08 14:27:18 +01:00
joerg@mysql.com
28b65497da Manual merge, no effect on 4.1. 2005-03-08 14:17:57 +01:00
lenz@mysql.com
8948e774f6 - bumped up version number in configure.in from 4.0.24 -> 4.0.25 (ChangeSet 1.2073 was already tagged
as 4.0.24)
2005-03-08 11:42:21 +01:00
joreland@mysql.com
75d705930d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-08 10:28:38 +01:00
joreland@mysql.com
fcd7b0ebc6 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-08 10:27:37 +01:00
joreland@mysql.com
56bc9cfacb bug#8918 - ndb - improve error message when stopping due to StartFailureTimeout 2005-03-08 10:25:21 +01:00
marko@hundin.mysql.fi
beea918092 InnoDB: Win64 portability fix: add missing declaration and
correct the definition of srv_max_buf_pool_modified_pct.
2005-03-08 11:12:18 +02:00
jimw@mysql.com
df84c534dd Flush entries from the query cache for tables used in
administrative statements that may alter the table, such
as REPAIR TABLE. (Bug #8480)
2005-03-07 18:15:19 -08:00
gluh@gluh.mysql.r18.ru
b5528a8dc6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0.7498
2005-03-07 19:32:54 +03:00
gluh@gluh.mysql.r18.ru
00449b8f9c Fix for bug#8978 : Crash on 'select format ...' 2005-03-07 18:56:18 +03:00
serg@serg.mylan
c36fa576c6 additional safety 2005-03-07 16:45:19 +01:00
serg@serg.mylan
112471e382 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-07 16:40:47 +01:00
joerg@mysql.com
c4feaafdcb Avoid empty build (failure) mails on Solaris (backport from 4.1). 2005-03-07 16:23:55 +01:00
serg@serg.mylan
44f9e4265b Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-07 15:32:53 +01:00
Sinisa@sinisa.nasamreza.org
5da6cd551d Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-03-07 16:23:41 +02:00
marko@hundin.mysql.fi
a6f17f4cc4 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-07 15:28:11 +02:00