Commit graph

18814 commits

Author SHA1 Message Date
mskold@mysql.com
d36f7357e7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-07-05 12:24:03 +02:00
lenz@mysql.com
57be8f42bf Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-07-04 22:20:11 +02:00
lenz@mysql.com
a300489d0c - The Max package should Require a matching MySQL-server package. Automatically replace
the version string with the base version of the current build
2005-07-04 22:11:38 +02:00
mskold@mysql.com
77c481329c Fixed indentation 2005-07-04 20:36:38 +02:00
lenz@mysql.com
eb88c898de Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-merge
2005-07-04 17:45:56 +02:00
lenz@mysql.com
8ef5ad5364 - manual merge 2005-07-04 16:05:20 +02:00
lenz@mysql.com
e21c783422 Merge mysql.com:/space/my/mysql-4.0.25-clone
into mysql.com:/space/my/mysql-4.0-build
2005-07-04 12:59:20 +02:00
lenz@mysql.com
c760d27cf1 - bumped up version number in configure.in to 4.0.26 2005-07-04 12:58:53 +02:00
lars@mysql.com
ff88e6fbf2 Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/b11678-mysql-4.1
2005-07-04 11:09:15 +02:00
bell@sanja.is.com.ua
67c9df1eb8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug_qc-4.1
2005-07-04 01:36:55 +03:00
bell@sanja.is.com.ua
54662b4487 merge 2005-07-04 01:36:06 +03:00
monty@mysql.com
62173c5a9d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-07-02 20:18:43 +03:00
monty@mysql.com
2735d7dcf6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-07-02 16:13:35 +03:00
kent@mysql.com
a06c4692f5 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-07-02 02:07:26 +02:00
kent@mysql.com
22fd02d157 configure.in:
Enable build with CXX=gcc and gcc version 4
2005-07-02 02:00:56 +02:00
kent@mysql.com
4cea53dd7d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-07-02 01:49:22 +02:00
bell@sanja.is.com.ua
17ef6b7d77 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-4.1
2005-07-01 20:14:55 +03:00
bell@sanja.is.com.ua
b6dc32a755 fixed create_distinct_group() to make references via ref_pointer_array 2005-07-01 20:13:07 +03:00
lars@mysql.com
02d0fdf470 Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/b11678-mysql-4.1
2005-07-01 16:13:05 +02:00
msvensson@neptunus.(none)
11d3c28575 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-07-01 15:40:29 +02:00
msvensson@neptunus.(none)
9613c434e0 Win port fixes 2005-07-01 15:39:36 +02:00
lars@mysql.com
4120003926 BUG#11678: mysqldump --master-data should fail if master binlog disabled 2005-07-01 12:01:00 +02:00
monty@mysql.com
3d02b808ba Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-07-01 10:07:01 +03:00
monty@mysql.com
e3a4c1a6b2 Optimization during review
Add extra check to delete [] to ensure we are not deleting not allocated data
2005-07-01 09:40:05 +03:00
lenz@mysql.com
59b5c9bf66 - backport of a compile fix from 4.1 (ChangeSet@1.2260.23.2 2005/05/19 from reggie)
"changed dl_name to udf->dl in mysql_create_function"
2005-06-30 17:33:23 +02:00
jani@ua141d10.elisa.omakaista.fi
15d4217c58 Don't allow 8bytes for data file pointers for now. 2005-06-30 17:55:47 +03:00
jani@ua141d10.elisa.omakaista.fi
b60175f9c4 Fixed Bug#11226 and reverted fix for Bug#6993.
Using 8 bytes for data pointer does not work at least on
all computers. The result may become 0 or negative number.
(mysqld, myisamchk)
2005-06-30 16:13:22 +03:00
mskold@mysql.com
569a846120 Changed delete_row to always get key from record argument, removed unused function 2005-06-29 16:17:47 +02:00
mskold@mysql.com
ec4bb86379 Changed delete_row to always get key from record argument 2005-06-29 16:13:50 +02:00
mskold@mysql.com
ff764e2b5a Moved connections first in test, to reduce risk of connecting before servers are fully connected 2005-06-29 15:31:43 +02:00
igor@rurik.mysql.com
ce53a3f229 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-06-29 02:44:41 -07:00
igor@rurik.mysql.com
4b8f2e9bb4 func_str.test:
Added test cases for bug #11469.
item_strfunc.h:
  Fixed bug #11469: wrong implementation of the not_null_tables
  method for CONCAT_WS.
2005-06-29 02:40:25 -07:00
bell@sanja.is.com.ua
f4a30c4d3b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-4.1
2005-06-28 22:59:16 +03:00
bell@sanja.is.com.ua
9283e3e3e8 fixed not_null_tables() for IN() (BUG#9393)
(IN() remove NULL rows only for tables from first argument (value which we looking for in IN() list) but not for tables from IN() list)
Also it will be better change Item::not_null_tables() to prohibit this optimisation by default for new created items in 5.0 or 5.1.
2005-06-28 22:20:25 +03:00
marko@hundin.mysql.fi
f230d35c64 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-06-28 15:33:41 +03:00
igor@rurik.mysql.com
1776464568 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-28 05:33:40 -07:00
monty@mysql.com
10c4678def Move reset of insert_values to ensure it's done also during error conditions
This fixed a failure of insert_update.test on some platforms
2005-06-28 15:06:16 +03:00
igor@rurik.mysql.com
04e6f472dd Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-06-28 03:24:06 -07:00
igor@rurik.mysql.com
42bb0eaf9f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-28 03:20:00 -07:00
igor@rurik.mysql.com
be1478f6f9 group_by.result, group_by.test:
Added a test case for bug #11414.
sql_select.cc:
  Fixed bug #11414: crash on Windows with some simple
  GROUP BY queries.
  It happened to an allocation of an array containing
  0 Copy_field elements in setup_copy_fields.
  The bug had been already fixed in 5.0.
2005-06-28 03:18:37 -07:00
bar@mysql.com
46536c3a60 ctype_ucs.result, ctype_ucs.test, ctype_utf8.result, ctype_utf8.test:
Fixing tests accordingly.
ctype-ucs2.c:
  The same fix for UCS2.
ctype-utf8.c:
  Bug #9557
  MyISAM utf8 table crash
  The problem was that my_strnncollsp_xxx could
  return big value in the range 0..0xffff.
  for some constant pairs it could return 32738,
  which is defined as MI_FOUND_WRONG_KEY in
  myisamdef.h. As a result, table considered to
  be crashed. 
  Fix to return -1,0 or 1.
2005-06-28 15:00:22 +05:00
kent@mysql.com
d16e1cafa7 make_win_src_distribution.sh:
Bug#11009, some more cleanup of unneded files from bootstrap
2005-06-28 05:25:29 +02:00
kent@mysql.com
eaec18bda6 Makefile.am:
Bug#9873, reenabled --without-man option to work
2005-06-28 04:49:03 +02:00
kent@mysql.com
7817b69d80 configure.in:
Enable build with CXX=gcc and gcc version 4
2005-06-28 04:44:27 +02:00
kent@mysql.com
fab90ce856 mysqld.dsp:
Corrected quoting of string "pro-nt"
2005-06-28 04:37:01 +02:00
kent@mysql.com
b3a00568fb opt_range.cc:
Added missing `;' to DBUG_RETURN()
2005-06-28 04:33:06 +02:00
bell@sanja.is.com.ua
b49b5805eb abort storing query to query cache if warnings appeared (BUG#9414) 2005-06-28 00:52:21 +03:00
monty@mysql.com
ec35d6bfca Fix test after last push 2005-06-27 20:31:02 +03:00
monty@mysql.com
f23603ffeb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-06-27 20:31:01 +03:00
monty@mishka.local
7398252d02 Portability fixes
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
2005-06-27 20:31:00 +03:00