Commit graph

17222 commits

Author SHA1 Message Date
lenz@mysql.com
7213ca46ad Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-02-02 19:25:43 +01:00
lenz@mysql.com
164b2ddf39 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-02-02 19:24:13 +01:00
lenz@mysql.com
e24d97ae58 - typo fix... 2005-02-02 19:23:24 +01:00
lenz@mysql.com
bac61c6b7a Merge mysql.com:/data0/mysqldev/my/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-02-02 18:45:29 +01:00
tulin@mysql.com
446e18c91e fix linkerror on sol9x86 2005-02-02 18:30:33 +01:00
jimw@mysql.com
bcac063558 Fix merge of func_str tests (accidently duplicated a test). 2005-02-02 09:05:52 -08:00
mysqldev@mysql.com
dd71fde35a Merge production:my/mysql-4.1-build
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 18:04:01 +01:00
jimw@mysql.com
5f0c4ff140 Merge fixes for #8248, #5569. 2005-02-02 08:21:11 -08:00
jimw@mysql.com
4104f160cb Merge mysql.com:/home/jimw/my/mysql-4.1-8207
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-02 07:51:55 -08:00
jimw@mysql.com
2ab66e644a Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-02 07:49:30 -08:00
monty@mysql.com
b131520f9d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 16:50:35 +02:00
lenz@mysql.com
7cb5afc052 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-02-02 13:45:32 +01:00
lenz@mysql.com
70b8360323 Small Do-compile improvements:
- added Option "--comment" to be able to override the default compilation comment
- improved the abort subroutine to not rely on an external "tail" command (the
  default /usr/bin/tail on Solaris does not understand the "-n" notation).
  Get rid of a "useless use of cat" case in the process.
2005-02-02 13:40:17 +01:00
serg@serg.mylan
33fc4b10b6 configure.in
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
    hide from the user options that do nothing
sql/sql_update.cc
    better fix for uninitialized used_index
2005-02-02 12:08:20 +01:00
joreland@mysql.com
f06452fb59 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-02 11:35:33 +01:00
tulin@mysql.com
3bdb97343a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 11:13:35 +01:00
tulin@mysql.com
653c6fa1ad backported configure flag from 5.0
workaround for HPUX signal.h error, missing extern "C" 
    moved my_thread_end to NdbThreadExit
   more checks for shared memory transporter signum setup
2005-02-02 10:50:33 +01:00
timour@mysql.com
2ad4cb38db Merge mysql.com:/home/timka/mysql/src/4.1-dbg
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
2005-02-02 09:55:41 +02:00
igor@rurik.mysql.com
9a779d6441 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-01 23:54:39 -08:00
igor@rurik.mysql.com
0fb0dab4ca func_str.result, func_str.test:
Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
2005-02-01 23:34:31 -08:00
timour@mysql.com
52e904c25c Fix for BUG#8023.
Allow LIMIT clause after DUAL.
2005-02-02 08:38:24 +02:00
joreland@mysql.com
d7c4d32b18 ndb - (backport from 4.1)
Fix weird link error on sol9x86
  - use incremental linker
2005-02-02 07:38:11 +01:00
joreland@mysql.com
fc80e0a44f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-02 06:32:11 +01:00
pekka@mysql.com
ea5c1f324c ndb - backup fix, found on powermacg4 2005-02-02 03:58:43 +01:00
jimw@mysql.com
2caee2b3f2 Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.0-8248
2005-02-01 18:34:28 -08:00
jimw@mysql.com
d9e128d78f Merge bk-internal:/home/bk/mysql-4.0
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-01 18:34:16 -08:00
jimw@mysql.com
e86457cef0 Fix QUOTE() to not reuse the input field for output, which resulted in
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248)
2005-02-01 18:29:10 -08:00
heikki@hundin.mysql.fi
7fb3a79794 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-02 01:47:46 +02:00
heikki@hundin.mysql.fi
b75bfa828d eval0eval.ic:
Remove wrong assertion that fails on 64 bits
2005-02-02 01:43:25 +02:00
jimw@mysql.com
76ff72d73f Merge mysql.com:/home/jimw/my/mysql-4.0-5569
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-01 15:38:27 -08:00
jimw@mysql.com
891e8d076c Fix value of YEAR field when set from a non-numeric string. (Bug #6067) 2005-02-01 15:08:31 -08:00
heikki@hundin.mysql.fi
b0a343dd06 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-02 00:41:25 +02:00
heikki@hundin.mysql.fi
e5479c3f90 rem0rec.ic:
Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed
2005-02-02 00:31:06 +02:00
heikki@hundin.mysql.fi
11c0260147 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-02 00:22:19 +02:00
jimw@mysql.com
a8039e1ac8 Make sure mysql_client_test and embedded test clients get added to
binary distribution on all platforms.
2005-02-01 11:59:44 -08:00
tulin@mysql.com
9ac631705a cleanup and streamlining of thread create/exit in ndb 2005-02-01 19:01:37 +01:00
joreland@mysql.com
ebfa526990 merge 2005-02-01 17:16:05 +01:00
joreland@mysql.com
46a75d5996 ndb - Put all output from ndb tools during mysql-test-run into log file 2005-02-01 17:08:39 +01:00
joreland@mysql.com
2ce71d0aba ndb -
1) New testcase
   Check every combination of ins/upd/del of length 5
   Check reading savepoint's
2) Fix 1 liner in acc wrt committing read
2005-02-01 16:49:23 +01:00
reggie@bob.(none)
b018755ea6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql41
2005-02-01 08:46:56 -06:00
monty@mysql.com
b87e0c52a7 Proper fix for comparision with ' '
(Bug #7788 "Table is full" occurs during a multitable update")
2005-02-01 16:27:08 +02:00
monty@mysql.com
4e92f2afb1 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2005-02-01 15:38:48 +02:00
monty@mysql.com
0751cb8ff1 Remove #if 0 as this only confuses the code withing adding anything 2005-02-01 15:36:48 +02:00
ram@gw.mysql.r18.ru
26dcd87ee6 merging 2005-02-01 17:20:32 +04:00
ram@gw.mysql.r18.ru
40daecb8b4 after merge fix up:
we should use REPLACE for $hostaname queries to avoid problems when $hostname=localhost.
2005-02-01 17:13:44 +04:00
lenz@mysql.com
c02d97b5e2 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-02-01 13:30:16 +01:00
lenz@mysql.com
2aa2ae5af2 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-02-01 13:19:21 +01:00
bell@sanja.is.com.ua
85f62aa67c Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2005-02-01 13:55:40 +02:00
bell@sanja.is.com.ua
48da18cd45 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-02-01 11:05:29 +02:00
marko@hundin.mysql.fi
dabb56a7cb After merge fixes 2005-02-01 10:24:09 +02:00