mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18338 commits 2778 branches 343 tags 1.6 GiB
Commit graph

18338 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
89ef3990d9 readline.h: 
Include <sys/ttydefaults.h> for CodeWarrior and CTRL define


cmd-line-utils/libedit/readline/readline.h:
  Include <sys/ttydefaults.h> for CodeWarrior and CTRL define
 2005-05-13 11:59:17 +02:00
unknown
cbbc4ff6a2 If the system is under high load 'show full processlist' might report the 
process of the predecessing test case instead of the current test case. 
Shifting the command to the end of the current test case should avoid this problem. 


mysql-test/r/ps_grant.result:
  Updated result
mysql-test/t/ps_grant.test:
  Shift ' show full processlist ' to the end of the test script
 2005-05-12 17:49:34 +02:00
unknown
0f436b32f1 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
 2005-05-10 18:14:45 +02:00
unknown
73a49cf1c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-10 17:52:17 +02:00
unknown
4c2265b0ae Fix for Ingo 
BUILD/check-cpu:
  Set old_flag to pentium
 2005-05-10 17:51:29 +02:00
unknown
5afb72220d ctype-big5.c: 
additional fix for bug@10493, for sjis
ctype-cp932.c:
  additional fix for bug#10493, for cp932


strings/ctype-cp932.c:
  additional fix for bug#10493, for cp932
strings/ctype-big5.c:
  additional fix for bug@10493, for sjis
 2005-05-10 17:00:54 +05:00
unknown
a862ef73ae Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/cw/mysql-4.1


configure.in:
  Auto merged
 2005-05-10 13:56:08 +02:00
unknown
05a945ecf4 Makefile.am, configure.in: 
Enable creation of embedded lib when --with-darwin-mwcc


configure.in:
  Enable creation of embedded lib when --with-darwin-mwcc
libmysqld/Makefile.am:
  Enable creation of embedded lib when --with-darwin-mwcc
 2005-05-10 13:53:47 +02:00
unknown
d4432343d1 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/root/mysql-4.1
 2005-05-10 14:24:58 +05:00
unknown
a91cf275c8 bug#10344: some string function fail for UCS2 
substr fix
 2005-05-10 14:13:58 +05:00
unknown
d7e49743e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-10 10:45:49 +02:00
unknown
31d7922823 Remove testcode 
sql/item_strfunc.h:
  Remove the testcode
 2005-05-10 10:45:16 +02:00
unknown
1fb790d3f0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10095


mysql-test/t/range.test:
  Auto merged
 2005-05-10 00:43:18 +02:00
unknown
4a1b6c0102 Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available 2005-05-10 00:40:41 +02:00
unknown
163b8bdc37 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/hf/work/mysql-4.1.ssj
 2005-05-10 02:54:49 +05:00
unknown
5cc6f2edb3 Fix for bug #10493 (SJIS fields are not correctly saved) 
strings/ctype-sjis.c:
  pos should be decreased
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2005-05-10 02:15:59 +05:00
unknown
e16c5284bb Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-09 22:43:09 +02:00
unknown
d03e4637b6 Add compiler settings for Pentium M 
BUILD/check-cpu:
  Pentium M
 2005-05-09 21:59:03 +02:00
unknown
8815d6cf60 configure.in: 
Bumped up version number to indicate 4.1.12 was branched off


configure.in:
  Bumped up version number to indicate 4.1.12 was branched off
 2005-05-09 18:14:10 +02:00
unknown
66446b31b7 SUBSTR with negative argument didn't work 
with multi-byte strings, length() instead
of numchars() where used in a mistake.
 2005-05-09 20:55:06 +05:00
unknown
b8ea7d4b8a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/ram/work/mysql-4.1
 2005-05-09 18:50:57 +05:00
unknown
3a842fdfc0 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733


sql/sql_yacc.yy:
  Auto merged
 2005-05-09 14:50:56 +01:00
unknown
09e426bf3c a fix (bug #10438: Raid stopped working because of change in atomic add detection). 
include/my_global.h:
  a fix (bug #10438: Raid stopped working because of change in atomic add detection).
  In order to compile with atomic.h on itanium we redefine 'new' because it's used
  as a local variable in this file and conflicts with a kernel header.
 2005-05-09 18:33:21 +05:00
unknown
e514a1eea2 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-09 06:33:20 -07:00
unknown
19b8643830 Bug#8733 - server accepts malformed query (multiply mentioned distinct) 
Detect conflicting options in SELECT


mysql-test/r/select.result:
  Test for bug#8733
mysql-test/t/select.test:
  Test for bug#8733
sql/mysql_priv.h:
  New bit for ALL
sql/sql_yacc.yy:
  We want to complain if DISTINCT or ALL is used in SELECT when a
  conflicting option is already selected.
 2005-05-09 14:31:46 +01:00
unknown
b7b8537a59 Fixes after review 
BUILD/check-cpu:
  Change variable name
  Add missing fi
  Test with -n instead of -z
 2005-05-09 14:49:27 +02:00
unknown
2e9ce665b3 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-09 05:30:11 -07:00
unknown
a91c804054 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
 2005-05-09 12:16:59 +02:00
unknown
12a3eb4dc8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-05-09 12:16:58 +02:00
unknown
61b5eb0d99 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


include/my_global.h:
  Auto merged
 2005-05-09 11:31:14 +02:00
unknown
a028af0872 Merge mysql.com:/home/jimw/my/mysql-4.1-10435 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-09 02:30:25 -07:00
unknown
4be881f25c After review fixes 
include/my_global.h:
  Add "&& defined(__GNUC__)"
 2005-05-09 11:30:20 +02:00
unknown
4ab9ce348d Fix check-cpu, add more recognized cpus 
BUILD/check-cpu:
  Recognize more cpu's
  Fix for older compilers
 2005-05-09 11:26:03 +02:00
unknown
e99c4c6cf2 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


include/my_global.h:
  Auto merged
sql/item.h:
  Auto merged
 2005-05-09 11:23:12 +02:00
unknown
90024205a8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
 2005-05-09 11:04:34 +02:00
unknown
645a71319d bug#10142 - ndb unique index resource shortage 
honor abort_option as TC now abort on 288


ndb/src/ndbapi/NdbIndexOperation.cpp:
  honor settings as TC now abort on 288
 2005-05-09 11:03:07 +02:00
unknown
dad8efdf6b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg9913


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
 2005-05-09 12:18:19 +04:00
unknown
27da9ccc50 Merge bk-internal:/home/bk/mysql-4.1 
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-05-09 09:53:13 +02:00
unknown
cb4b456bc6 - added "--skip-comments" to the "mysqldump" test to avoid printing comments that include 
version-dependent information (which causes test failures when running the test with a
  different version string)


mysql-test/r/mysqldump.result:
  - fixed the results (removed the version-dependent comments to avoid a test failure)
mysql-test/t/mysqldump.test:
  - added "--skip-comments" to avoid printing comments that include version-dependent information
    (which causes test failures when running the test with a different version string)
 2005-05-09 09:25:47 +02:00
unknown
1898bd9586 don't use tmp file for such a triviality 2005-05-09 09:24:05 +02:00
unknown
76cfd9c075 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-05-09 00:51:05 +02:00
unknown
6706b9fac9 - fix the range test to pass when InnoDB is note enabled (e.g. in the "-classic" build) 2005-05-09 00:47:47 +02:00
unknown
92e350344a Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-05-09 00:36:53 +02:00
unknown
39dfdcffcb - added cmd-line-utils/libedit/vis.h to the source distribution 
cmd-line-utils/libedit/Makefile.am:
  - added vis.h to the source distribution
 2005-05-09 00:35:48 +02:00
unknown
d808b76db5 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2005-05-08 14:24:43 -07:00
unknown
c0f4ae6be9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-05-08 22:25:38 +02:00
unknown
8b31c677a2 Fixes to compile with icc 2005-05-08 22:16:24 +02:00
unknown
0bc5583993 ndb - autotest 
fix name of result tar ball


ndb/test/run-test/ndb-autotest.sh:
  append run to result tar ball
 2005-05-08 20:23:05 +02:00
unknown
1923ddea2e Merge bk-internal:/home/bk/mysql-4.1 
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
 2005-05-08 19:16:37 +02:00
unknown
1a4fd96bd5 errmsg.txt: 
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).


sql/share/czech/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/danish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/dutch/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/english/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/estonian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/french/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/german/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/greek/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/hungarian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/italian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/japanese/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/japanese-sjis/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/korean/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/norwegian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/norwegian-ny/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/polish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/portuguese/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/romanian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/russian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/serbian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/slovak/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/spanish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/swedish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/ukrainian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2005-05-08 19:14:28 +02:00