Commit graph

24468 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
8b71793766 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-06 16:59:56 +03:00
bell@sanja.is.com.ua
b5690d2149 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
2005-07-06 16:32:25 +03:00
lenz@mysql.com
ba8bb1604a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-06 14:53:54 +02:00
lenz@mysql.com
5e18917c3e Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-07-06 14:53:24 +02:00
lenz@mysql.com
f0cf04190e Merge mysql.com:/space/my/mysql-5.0.9-clone
into mysql.com:/space/my/mysql-5.0-build
2005-07-06 14:39:00 +02:00
lenz@mysql.com
a9e1b8756d - manual merge of the make_binary_distribution.sh ChangeSet propagation 2005-07-06 14:30:51 +02:00
bell@sanja.is.com.ua
94ec658d6f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
2005-07-06 15:20:51 +03:00
lenz@mysql.com
68e5693096 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build
2005-07-06 14:00:24 +02:00
lenz@mysql.com
49986c7e05 - backported a change for make_binary_distribution.sh from 5.0 for easier building of
all versions: added an option "--machine" that allows to override the autodetected
  architecture string (e.g. "i386") that becomes part of the binary package name with 
  a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
  script
2005-07-06 13:58:29 +02:00
mskold@mysql.com
9ef31a2825 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-06 13:10:12 +02:00
joerg@mysql.com
8b2f9e8f25 Increase version number to 5.0.10, as 5.0.9 has been cloned off. 2005-07-06 12:54:22 +02:00
bell@sanja.is.com.ua
f4c1e5fa45 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
2005-07-06 13:23:21 +03:00
mskold@mysql.com
58703a4380 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-07-06 11:50:05 +02:00
mskold@mysql.com
458618d102 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-06 11:47:48 +02:00
mskold@mysql.com
fe73e69b4e Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-06 11:39:48 +02:00
lenz@mysql.com
29653d5a79 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-06 11:29:22 +02:00
marko@hundin.mysql.fi
e27338ac23 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-07-06 12:29:20 +03:00
ramil@mysql.com
7f6d36a336 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-06 14:29:19 +05:00
lenz@mysql.com
88e21f83d0 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-07-06 11:25:58 +02:00
mskold@mysql.com
7063d85bf9 Fixed handling of failed primary key update in INSERT .. ON DUPLICATE KEY UPDATE .. 2005-07-06 11:23:36 +02:00
ramil@mysql.com
fe09e62d36 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into  mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-06 14:01:30 +05:00
ramil@mysql.com
f82420356f a fix (bug #11544: Use of missing rint() function on QNX). 2005-07-06 13:51:53 +05:00
bell@sanja.is.com.ua
c41c8accd7 Merge 2005-07-06 11:36:27 +03:00
kent@mysql.com
f07ac780f8 init_db.sql:
add new table privileges
Makefile.am:
  Include path to regex dir was accidently removed
2005-07-06 10:16:36 +02:00
kent@mysql.com
512d130110 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-07-06 10:03:07 +02:00
dlenev@mysql.com
d9d20a82d0 After merge fix. 2005-07-06 11:34:53 +04:00
lenz@mysql.com
36ddf47bed Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-07-06 08:50:22 +02:00
lenz@mysql.com
875a7d596b Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-06 08:42:45 +02:00
marko@hundin.mysql.fi
006bb7bbc9 InnoDB: Make the srv_thread_concurrency checks more consistent. 2005-07-06 09:38:31 +03:00
dlenev@mysql.com
8a924ac456 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11394
2005-07-06 10:21:27 +04:00
jimw@mysql.com
060a53ab25 Update test results 2005-07-05 18:23:55 -07:00
jimw@mysql.com
af5f5ab3ed Merge mysql.com:/home/jimw/my/mysql-5.0-6903
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 17:05:31 -07:00
jimw@mysql.com
a2244a9094 Merge jwinstead@production.mysql.com:my/mysql-5.0-10844
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 15:24:35 -07:00
jimw@mysql.com
2669b86612 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 15:23:13 -07:00
kent@mysql.com
b6d3eec4f8 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-07-06 00:19:26 +02:00
jimw@mysql.com
ac8f9d3864 Fix test cases 2005-07-05 15:19:04 -07:00
kent@mysql.com
ca420edc21 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-07-06 00:15:55 +02:00
kent@mysql.com
8e3b393d5c Merge 2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a Makefile.am:
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
kent@mysql.com
81cf9394bf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-07-05 23:21:30 +02:00
jimw@mysql.com
c45f86a265 Merge mysql.com:/home/jimw/my/mysql-4.1-10986
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:56:47 -07:00
jimw@mysql.com
9f654b806a Merge mysql.com:/home/jimw/my/mysql-4.1-11440
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:54:12 -07:00
jimw@mysql.com
81e50844b3 Merge mysql.com:/home/jimw/my/mysql-4.1-11330
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:51:16 -07:00
kent@mysql.com
f29a853ad7 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp2
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-07-05 20:49:04 +02:00
lenz@mysql.com
ddca379b87 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build
2005-07-05 19:53:35 +02:00
jimw@mysql.com
485f2c93c2 Merge mysql.com:/home/jimw/my/mysql-5.0-10214
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 09:47:20 -07:00
jimw@mysql.com
de55960430 Add documentation to the escape_*() functions in mysys. 2005-07-05 09:45:32 -07:00
kent@mysql.com
37dd997d8b lowercase_table2.test, lowercase_table2.result:
Use IF EXISTS in initiation section
2005-07-05 17:27:37 +02:00
lenz@mysql.com
eaac485b17 - disabled openlogging to satisfy BK when using a commercial license key 2005-07-05 17:09:56 +02:00
mats@mysql.com
0449ee1ca8 Merging 4.1 into 5.0 2005-07-05 16:02:03 +02:00