mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19805 commits 2784 branches 343 tags 1.6 GiB
Commit graph

9523 commits

Author SHA1 Message Date
ram@gw.mysql.r18.ru
c38886b20c timed_mutexes moved to include/my_sys.h and mysys/my_static.c 
to avoid linking problems referring to the variable from .c programs.
 2005-01-26 18:37:49 +04:00
ingo@mysql.com
be5dade853 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-26 15:31:31 +01:00
ingo@mysql.com
300337cee7 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-26 15:31:06 +01:00
ingo@mysql.com
5ad151aa21 Test Bug: Memory leaks in the archive handler. 
Moved initialization code into a new init function.
Added a new cleanup function.
Added a call to close the meta file.
 2005-01-26 15:27:31 +01:00
georg@beethoven.site
3b2bf2f512 Fixes for windows compilation bugs 
(After review of cs georg:1.1800 by Monty)
 2005-01-26 15:19:20 +01:00
dlenev@mysql.com
e85f70ba72 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
 2005-01-26 16:40:50 +03:00
ram@gw.mysql.r18.ru
a27208cc03 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
 2005-01-26 17:40:49 +04:00
bell@sanja.is.com.ua
0bf6e3aefc fixed cleanup of result object of subqueries. (BUG#8125) 2005-01-26 15:27:45 +02:00
ram@gw.mysql.r18.ru
7f6fca4cf0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
 2005-01-26 17:09:38 +04:00
bar@mysql.com
8828884f4c CSC#4385: slow sorting for UTF8 large table: 
my_strnxfrm_utf8 now requires 2 bytes per character
in filesort key, instead of 3 bytes per character.
Shorter filesort keys make sorting faster.
 2005-01-26 16:34:09 +04:00
ram@gw.mysql.r18.ru
142ed6735f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
 2005-01-26 16:26:19 +04:00
tomas@poseidon.ndb.mysql.com
f9d0512fc3 Merge 2005-01-26 13:22:07 +01:00
marko@hundin.mysql.fi
86da2b8f40 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
 2005-01-26 14:07:40 +02:00
ram@gw.mysql.r18.ru
4453a6243e after review fixup (bug #8129: help.test fails using --ps-protocol) 2005-01-26 16:02:19 +04:00
ram@gw.mysql.r18.ru
f995a526b1 a fix (bug #8129: help.test fails using --ps-protocol) 2005-01-26 15:11:55 +04:00
tomas@poseidon.ndb.mysql.com
1a331191a3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-26 11:32:22 +01:00
tomas@poseidon.ndb.mysql.com
5779a6a576 Bug#8101 unique indexes which attribute are _not_ specified in the order of the table does not work 2005-01-26 11:31:46 +01:00
tomas@poseidon.ndb.mysql.com
9259dd1d81 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-26 09:42:52 +01:00
dlenev@mysql.com
560f2bd4d6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
 2005-01-26 11:23:14 +03:00
ingo@mysql.com
5ea224b824 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-26 09:09:53 +01:00
ingo@mysql.com
f003fb1f9c Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-4000
 2005-01-26 09:07:25 +01:00
serg@serg.mylan
d8f35cec21 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-01-26 09:05:58 +01:00
serg@serg.mylan
7084b494c4 innobase/include/univ.i 
remove a change that broke the test
 2005-01-26 08:57:43 +01:00
igor@rurik.mysql.com
34fa69a194 order_by.result, order_by.test: 
Added a test case for bug #7672.
sql_yacc.yy:
  Fixed bug #7672.
  Made queries of the form (SELECT ...) ORDER BY ... to
  be equivalent to SELECT ... ORDER BY ...
 2005-01-25 14:30:38 -08:00
heikki@hundin.mysql.fi
9a6e0d06e0 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-01-25 22:12:22 +02:00
heikki@hundin.mysql.fi
d7e5c4d617 sql_class.h, set_var.cc, mysqld.cc: 
Add settable variables for semi-sync replication
 2005-01-25 22:11:21 +02:00
serg@serg.mylan
76f3d6f002 merged 2005-01-25 21:11:04 +01:00
jimw@mysql.com
94da57dc65 Always call vio_in_addr() so that thd->remote is 
always initialized. (Bug #5569)
 2005-01-25 12:06:55 -08:00
tomas@poseidon.ndb.mysql.com
5f33acc006 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-25 20:55:29 +01:00
monty@mysql.com
37168015cd Cleanups during review 2005-01-25 21:27:51 +02:00
ingo@mysql.com
704d84a12c Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-25 19:37:15 +01:00
patg@patrick-galbraiths-computer.local
1bceba0995 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
 2005-01-25 09:35:57 -08:00
marko@hundin.mysql.fi
638e2bd733 InnoDB: Backport innodb_autoextend_increment from 4.1 2005-01-25 16:27:13 +02:00
konstantin@mysql.com
6c3a4aee18 Fix two typos in comments. 2005-01-25 17:25:46 +03:00
mskold@mysql.com
da658b9f11 Fix for failing INSERT IGNORE in test ndb_insert 2005-01-25 15:08:51 +01:00
tomas@poseidon.ndb.mysql.com
d8fe3d01af Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-25 13:48:12 +01:00
tomas@poseidon.ndb.mysql.com
b4eebbc0b6 changed from using column names to column id in ndb setBound in ha_ndbcluster 2005-01-25 13:46:40 +01:00
ram@gw.mysql.r18.ru
3350a7ec6d Merge gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
 2005-01-25 13:05:15 +04:00
ingo@mysql.com
bcd1c31a53 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-25 09:47:01 +01:00
gluh@gluh.mysql.r18.ru
849ef34156 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-25 11:42:50 +03:00
ingo@mysql.com
88c434a905 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-25 09:06:11 +01:00
ram@gw.mysql.r18.ru
8c043a299b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
 2005-01-25 11:06:12 +04:00
sergefp@mysql.com
3822eeb972 Fix for BUG#8003 attempt 2: 
Call file->external_lock() for handler objects that index_merge code creates in addition to 
  the handler object opened in open_and_lock_tables.
 2005-01-25 07:37:06 +03:00
jimw@mysql.com
d11081bd6f Merge 2005-01-24 13:48:48 -08:00
jimw@mysql.com
09aaba03cf Merge mysql.com:/home/jimw/my/mysql-4.1-7887 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-24 12:47:19 -08:00
jimw@mysql.com
fa1098618e Set lower_case_file_system when it is being tested to check if 
lower_case_tables_names=2 is sensible. Related to Bug #7887.
 2005-01-24 12:31:14 -08:00
patg@patrick-galbraiths-computer.local
d6727ff70f Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
 2005-01-24 11:31:21 -08:00
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
gluh@gluh.mysql.r18.ru
e492c1b44e Additional fix for WL#1629: SHOW with WHERE(discussed with PeterG) 
- Do not allow a column list as part of SHOW WITH WHERE task.
 - The WHERE clause must accept field names which are
   valid in SHOW, not INFORMATION_SCHEMA names.
 2005-01-24 18:44:54 +03:00
bell@sanja.is.com.ua
6d71acf01e fixed way of forward reference detection to support literal constant (BUG#8025) 2005-01-24 17:17:19 +02:00
serg@serg.mylan
79240013b2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
bell@sanja.is.com.ua
2371c992de check that row elements have the same dimention that SELECT list elements in comporison between rows and subqueries added (BUG#8022) 2005-01-24 15:56:57 +02:00
bell@sanja.is.com.ua
76ae5caca0 fixed column number fetchinmg for subqueries. (BUG#8020) 
fixed cols() method call (it have to be called only after fix_fields())
 2005-01-24 14:25:44 +02:00
ingo@mysql.com
c4a0eb142b Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-24 10:48:52 +01:00
ram@gw.mysql.r18.ru
5432e8a3d7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
 2005-01-24 13:47:52 +04:00
ingo@mysql.com
47c4009149 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-24 10:47:52 +01:00
ingo@mysql.com
5f23207d95 Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-4000
 2005-01-24 10:08:45 +01:00
bell@sanja.is.com.ua
5e36e83164 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-01-23 21:58:24 +02:00
igor@rurik.mysql.com
14eceb4b98 Manual merge 2005-01-22 03:12:44 -08:00
igor@rurik.mysql.com
0b61a16fd2 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-01-22 02:42:54 -08:00
igor@rurik.mysql.com
8527f256c0 select_found.result, select_found.test: 
Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.
 2005-01-22 02:40:27 -08:00
ingo@mysql.com
12879fc30d WL#2126 - Multi_read_range. 
Addendum for correct multi_range_count system variable handling.
Fixed a typo.
Added to sys_variables.
Added to init_vars.
 2005-01-21 17:38:46 +01:00
timour@mysql.com
e19c6a856d Manual merge of the fix for BUG#4285 from 4.1 2005-01-21 17:41:11 +02:00
timour@mysql.com
36f1e91b69 Merge of fix for BUG#4258 from 4.1. 
Needs additional manual merge.
 2005-01-21 17:38:36 +02:00
timour@mysql.com
b266ad2c24 Merge mysql.com:/home/timka/mysql/src/4.1-bug-4285 
into mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-01-21 16:47:51 +02:00
ingo@mysql.com
c7563247d1 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-21 14:57:57 +01:00
ram@gw.mysql.r18.ru
0bf3ae74b6 A fix (Bug #8015: server refuses to start with long basedir path). 2005-01-21 17:51:24 +04:00
bar@mysql.com
10c4977878 sql_show.cc: 
#7943: Wrong prefix lengths reported on UTF-8 columns
  after merge fix.
 2005-01-21 17:00:14 +04:00
bell@sanja.is.com.ua
938acb3291 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-01-21 14:54:27 +02:00
bar@mysql.com
2f6e0864ad Bug#7943: Wrong prefix lengths reported on UTF-8 columns 
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
 2005-01-21 16:49:20 +04:00
ram@gw.mysql.r18.ru
9c3c566fcb A fix (bug #7261: Alter table loses temp table with lower_case_table_names=2). 2005-01-21 15:14:31 +04:00
ingo@mysql.com
da091f2c22 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-21 12:14:16 +01:00
ingo@mysql.com
565c2fdb6c Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-21 09:53:31 +01:00
ram@gw.mysql.r18.ru
84f0b1eeee Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-21 12:10:19 +04:00
patg@pc248.lfp.kcls.org
1da60b9f45 -Added quote_data and needs_quotes (moved from federated handler. 
-New tests and results

logging_ok:
  Logging to logging@openlogging.org accepted
ha_federated.h:
  removed quote_data and type_quote (now in the Field class)
ha_federated.cc:
  moved quote_data and type_quote to field class
field.h:
  new methods quote_data and needs_quotes declared
field.cc:
  new field class methods quote_data and needs_quotes (per Monty's request)
federated.test:
  more tests, joins, index tests
have_federated_db.require:
  new name of federated system var
federated.result:
  new test results for federated handler
have_federated_db.inc:
  changed name of variable in test due to change in vars
sql_analyse.cc:
  over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler.
mysql_priv.h:
  define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler 
ha_federated.cc:
  implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions.
 2005-01-20 18:36:40 -08:00
tomas@poseidon.ndb.mysql.com
61b1de9533 2005-01-20 23:23:15 +01:00
tomas@poseidon.ndb.mysql.com
3dfcf07cc9 ha_ndbcluster.cc: 
read row size with wrong type
 2005-01-20 22:28:08 +01:00
sergefp@mysql.com
2113675cbc Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-wl2126-fix
 2005-01-20 20:57:30 +03:00
ingo@mysql.com
9bf63b1436 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-20 16:41:09 +01:00
mskold@mysql.com
d959e2ab40 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-20 16:41:08 +01:00
ingo@mysql.com
f5d36349a9 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-20 16:20:34 +01:00
ingo@mysql.com
d39d19005f Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-4000
 2005-01-20 16:17:33 +01:00
mskold@mysql.com
44a511a191 Fix for Bug #7988 Bitfield test fails 2005-01-20 15:50:56 +01:00
tomas@poseidon.ndb.mysql.com
86197400bc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-20 15:37:27 +01:00
tomas@poseidon.ndb.mysql.com
dd6958eb20 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-20 15:21:00 +01:00
tomas@poseidon.ndb.mysql.com
ac53ecce1c added variable NDB_MGM to be able to run the management client in tests 
added testcase for Bug#8035
    added option to wait for not-started
    Bug#8035
 2005-01-20 13:45:42 +01:00
bar@mysql.com
6b5c7c7290 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-20 16:08:27 +04:00
bell@sanja.is.com.ua
3bd203d3f6 fixed problem with distinct select with grouping and subqueries (BUG#7946) 2005-01-20 13:56:22 +02:00
bar@mysql.com
ca48cfbfcc item_cmpfunc.cc: 
Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.
 2005-01-20 15:38:56 +04:00
bar@mysql.com
5ed1b14464 errmsg.txt: 
Adding Shift-JIS error messages
  for Japanese Windows distributions.
  Thanks to Serg for help with a perl program 
  to merge 4.1 messages into 5.0 format :)
 2005-01-20 15:33:21 +04:00
ram@gw.mysql.r18.ru
dfe8132fb4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-20 14:22:02 +04:00
joreland@mysql.com
bca4f68773 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-20 10:13:45 +01:00
bar@mysql.com
07be090e6e errmsg.txt: 
Minor fix after character set conversion.
 2005-01-20 13:08:16 +04:00
sergefp@mysql.com
a5a99cf7a9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-20 11:57:30 +03:00
ram@gw.mysql.r18.ru
c397751373 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-20 12:56:18 +04:00
bar@mysql.com
0afb9b244a configure.in: 
Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.
.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt
 2005-01-20 12:44:33 +04:00
bar@mysql.com
c1d40baf18 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-20 12:42:08 +04:00
bar@mysql.com
1650728655 errmsg.txt: 
new file
 2005-01-20 12:37:02 +04:00
sergefp@mysql.com
9dda3a70d3 Merge 2005-01-20 07:51:00 +03:00
dlenev@brandersnatch.localdomain
348218d21d Fix for bug #7637: "Test failure: 'user_limits' on QNX and 64-bit systems" 
Made user_limits.test scheduling independant (this solves failure on QNX).

Made sys_var_max_user_conn variable int sized. Changed 
max_user_connections from ulong to uint to be able to use it in 
sys_var_max_user_conn::value_ptr() (solves failures on 64-bit platforms).
 2005-01-20 00:54:01 +03:00
jimw@mysql.com
3bdfe44859 Warn when mysqld starts up with lower_case_table_names=2 but datadir is 
on a case-sensitive filesystem. (Bug #7887)
 2005-01-19 12:23:24 -08:00
ingo@mysql.com
ea8882be80 BUG#6034 - Error code 124: Wrong medium type. 
Version for 5.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
Now the preparation is split into two prepare methods.
The first detects the situation and defers some preparations
until the second phase.
 2005-01-19 21:20:55 +01:00
ingo@mysql.com
fd0fdcdaa8 BUG#6034 - Error code 124: Wrong medium type. 
Version for 4.1. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.
 2005-01-19 21:16:27 +01:00
ingo@mysql.com
9a914a0022 BUG#6034 - Error code 124: Wrong medium type. 
Version for 4.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.
 2005-01-19 21:13:30 +01:00
sergefp@mysql.com
9a7a47c21c Merge mysql.com:/dbdata/psergey/mysql-4.1-bug7885 
into mysql.com:/dbdata/psergey/mysql-5.0-bug7885
 2005-01-19 23:11:50 +03:00
sergefp@mysql.com
b1c3e43060 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
 2005-01-19 23:02:28 +03:00
bell@sanja.is.com.ua
e05b028c80 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-01-19 20:53:29 +02:00
tulin@build.mysql.com
16f77ce996 Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-19 14:20:28 +01:00
gluh@gluh.mysql.r18.ru
c1b92f6a90 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-19 16:20:25 +03:00
gluh@gluh.mysql.r18.ru
994c1fd4d8 View field names should be case insensitive 2005-01-19 16:19:10 +03:00
ram@gw.mysql.r18.ru
92545cb3a9 ER_WARN_DATA_TRUNCATED replaced with WARN_DATA_TRUNCATED. 2005-01-19 16:24:06 +04:00
timour@mysql.com
7fb0de20f3 Final patch for BUG#4285. 
This patch collects all previous patches into one.

The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
 2005-01-19 12:55:54 +02:00
ram@gw.mysql.r18.ru
f131e5a925 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-19 12:05:59 +04:00
ram@gw.mysql.r18.ru
c24c023e8c A fix (bug #6999: Traditional: Wrong SQLSTATE returned for string truncation). 2005-01-19 12:04:35 +04:00
joreland@mysql.com
2af06e0b32 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-19 07:37:42 +01:00
joreland@mysql.com
18bd4a2513 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-19 07:34:57 +01:00
joreland@mysql.com
b0b8f9115a bug#7693 - ndb 
when using shm transporter, set sigmask on each thread using pthread_sigmask
 2005-01-19 07:23:20 +01:00
tomas@poseidon.ndb.mysql.com
f8a0287fac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-19 04:44:45 +01:00
tomas@poseidon.ndb.mysql.com
05bc990045 changed "formatting" after sergs comments on prev chanset 2005-01-19 04:43:54 +01:00
jimw@mysql.com
aa414896f0 Fix query cache to not respond to old clients with a 4.1-protocol 
response. (Bug #6511)
 2005-01-18 15:59:39 -08:00
jimw@mysql.com
1edf7279ef Merge from 4.1. 2005-01-18 13:59:55 -08:00
jimw@mysql.com
06f60f6d65 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-18 13:34:22 -08:00
Sinisa@sinisa.nasamreza.org
a2e0ecbf03 after merge fixes 2005-01-18 23:34:15 +02:00
Sinisa@sinisa.nasamreza.org
08639a88b2 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-01-18 23:29:47 +02:00
tomas@poseidon.ndb.mysql.com
a7c56a858b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-18 22:25:19 +01:00
Sinisa@sinisa.nasamreza.org
477047401c fixing wrong value for "examined rows" when UNION's are used. 2005-01-18 23:13:29 +02:00
tomas@poseidon.ndb.mysql.com
aabe11028a removed default usage of shared memory transporter as it is not verified on enough platforms 2005-01-18 22:09:15 +01:00
sergefp@mysql.com
48d7fe1671 Fix for valgrind failures in get_mm_tree. 2005-01-18 23:50:42 +03:00
jimw@mysql.com
59ffad87cc Merge mysql.com:/home/jimw/my/mysql-4.1-6913 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-18 12:27:00 -08:00
jimw@mysql.com
2fac8bd044 Merge changed tests 2005-01-18 12:25:56 -08:00
jimw@mysql.com
bc35532bcc Merge mysql.com:/home/jimw/my/mysql-4.0-7700 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-01-18 11:39:10 -08:00
dlenev@mysql.com
af878017b2 Merge mysql.com:/home/dlenev/src/mysql-4.1-merges 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-18 21:27:09 +03:00
bar@mysql.com
05204a9b3c After-merge clean-up 2005-01-18 22:12:33 +04:00
bar@mysql.com
f93bfe06b3 merge 2005-01-18 21:38:40 +04:00
sergefp@mysql.com
a55f4a5da4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 19:49:00 +03:00
tomas@poseidon.ndb.mysql.com
1b8e1674b4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-18 17:48:59 +01:00
gluh@gluh.mysql.r18.ru
0e5acfbb7b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-18 19:48:58 +03:00
gluh@gluh.mysql.r18.ru
16a2f9d204 bug #7981: SHOW GLOBAL STATUS crashes server(fix after review) 2005-01-18 19:47:39 +03:00
tomas@poseidon.ndb.mysql.com
61f63776db compile error: moved inline 
compile warning: changed eq_range -> eq_r
 2005-01-18 16:31:05 +01:00
gluh@gluh.mysql.r18.ru
c965dc34cd Fix for bug #7981: SHOW GLOBAL STATUS crashes server 2005-01-18 17:37:45 +03:00
sergefp@mysql.com
b1d55200b1 Fix for BUG#7885 2005-01-18 17:26:05 +03:00
dlenev@mysql.com
3d4eb575a2 Manual merge of fix for bug #7884 "Able to add invalid unique index on 
TIMESTAMP prefix" into 4.1 tree.
 2005-01-18 17:23:46 +03:00
dlenev@mysql.com
9e8d33ca35 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg7884
 2005-01-18 17:05:09 +03:00
dlenev@mysql.com
b894c47d1d Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum() 
macros.

It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".
 2005-01-18 17:04:16 +03:00
sergefp@mysql.com
5d9b87ea9a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:48:50 +03:00
sergefp@mysql.com
d89166cd34 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:46:26 +03:00
guilhem@mysql.com
78b7ec0258 slave.cc: 
5.0 has a different way of knowing if master is < 3.23.57
 2005-01-18 14:46:26 +01:00
bar@mysql.com
8cfe729678 1. Item now uses my_charset_bin by default, 
not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.
 2005-01-18 17:41:06 +04:00
sergefp@mysql.com
1eab462cca Post-review fixes for the previous cset. No code behavior changes. 2005-01-18 16:16:55 +03:00
serg@serg.mylan
b53757ba91 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-18 11:45:41 +01:00
guilhem@mysql.com
5fbdd9bdcd Merge mysql.com:/home/mysql_src/mysql-4.1-clean 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-18 11:06:37 +01:00
guilhem@mysql.com
9569b0226f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-18 10:24:25 +01:00
bar@mysql.com
b2dbddc39d Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-18 10:45:09 +04:00
bar@mysql.com
8f23e90232 #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals 
We should not overwrite res if it is returned from a const item.
 2005-01-18 10:42:29 +04:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
monty@mysql.com
edffca827e Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2005-01-18 03:52:15 +02:00
jimw@mysql.com
a35c324358 Fix over-optimization that could result in an unsigned double field being 
set to a negative value. (Bug #7700)
 2005-01-17 16:13:56 -08:00
monty@mysql.com
5ba79d72a7 Anoter fix for moved IO_CACHE object 2005-01-18 02:04:41 +02:00
bell@sanja.is.com.ua
0594d6af8b 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-01-18 01:15:02 +02:00
bell@sanja.is.com.ua
fd3d976f64 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
 2005-01-18 01:11:02 +02:00
serg@serg.mylan
83ef8c58a7 make the code to look safe, not only be safe 2005-01-17 22:35:53 +01:00
guilhem@mysql.com
5e43cf86a6 Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'": 
Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)
 2005-01-17 21:26:14 +01:00
jimw@mysql.com
dbe43d34a6 Print a warning when an old table (with no character set stored) is opened 
and the default character set is multi-byte, which will result in character
column size changes. (Bug #6913)
 2005-01-17 12:22:23 -08:00
reggie@bob.(none)
da9f7c7ec4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bob.(none):/home/reggie/bk/mysql-4.1
 2005-01-17 14:08:36 -06:00
reggie@bob.(none)
e1dc421a04 Bug #7966 query cache doesn't work properly with batch statements 
sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query
 2005-01-17 13:40:36 -06:00
bell@sanja.is.com.ua
dcfdf011c6 backported from 5.0 patch initialization of main select for commands where subqueries are possible 2005-01-17 19:52:07 +02:00
joerg@mysql.com
88b1fbaf2f Allow "classic" builds (= without InnoDB) by eliminating an "unresolved reference" (bug#7961). 2005-01-17 18:08:07 +01:00
timour@mysql.com
bb77b2e55f Fix for BUG#7331 merged manually from 4.1. 2005-01-17 17:19:33 +02:00
bell@sanja.is.com.ua
bd15d10a07 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-01-17 13:23:39 +02:00
timour@mysql.com
06fce173c0 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
 2005-01-17 12:41:59 +02:00
bar@mysql.com
3d4714424c Merge 2005-01-17 12:30:12 +04:00
jan@hundin.mysql.fi
c894ebd66c Required changes to support recovery of X/Open XA in InnoDB. 2005-01-17 09:09:59 +02:00
bar@mysql.com
e7e5e8b1e7 user_var.result, func_str.result, item_strfunc.cc: 
bug#7839 ncorrect collation for char(ascii('a'))
 2005-01-17 10:38:35 +04:00
sergefp@mysql.com
6303ca7efa Fixes in opt_range.cc: ROR plan choice code 
* Removed unused parameters 
 * Fixed several cost calculation errors in ror_intersect_add
 * Better code structure for ror_intersect_add and get_best_ror_intersect
 2005-01-17 00:18:19 +03:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
bell@sanja.is.com.ua
ff3b643959 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-01-16 18:36:50 +02:00
bell@sanja.is.com.ua
2ca7c0062f postreview changes 2005-01-16 18:36:13 +02:00
serg@serg.mylan
2c0d5bb41d documented handlerton structure 2005-01-16 16:11:16 +01:00
guilhem@mysql.com
1cb5d98d85 When we warn that --log-bin alone is dangerous, we give a suggestion. 2005-01-16 15:46:28 +01:00
guilhem@mysql.com
6cc7f39da0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-16 15:14:06 +01:00
guilhem@mysql.com
c30e600081 Merge 2005-01-16 15:10:42 +01:00
serg@serg.mylan
1034677f94 XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00
jimw@mysql.com
65b800736f Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-15 10:14:34 -08:00
dlenev@brandersnatch.localdomain
31d3aabb49 Porting fix for bug #7586 "TIMEDIFF for sec+microsec not working properly" 
to 5.0 tree (since it was lost during last merge).
 2005-01-15 20:02:46 +03:00
monty@mysql.com
8d616390e9 After merge fixes 
Fix for BIT(X) field as string
 2005-01-15 17:38:43 +02:00
monty@mysql.com
3b0f8cabaf Merge with global tree 2005-01-15 14:39:16 +02:00
monty@mysql.com
0a1076a25f Merge with 4.1 2005-01-15 14:09:45 +02:00
monty@mysql.com
a37e91e435 Changed interface for my_strntod() to make it more general and more portable 2005-01-15 12:28:38 +02:00
monty@mysql.com
f34bc883ab Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-15 12:00:56 +02:00
guilhem@mysql.com
de1ff0698b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-15 10:22:05 +01:00
guilhem@mysql.com
09f36a69b9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-15 10:21:50 +01:00
igor@rurik.mysql.com
cd577f2590 func_gconcat.result, func_gconcat.test: 
Added a test case for bug #7769.
item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.
 2005-01-15 01:05:00 -08:00
monty@mysql.com
7681e62422 Merge 2005-01-15 03:49:07 +02:00
monty@mysql.com
6d280ac161 Fixed possible access to unintialized memory in filesort when using many buffers 2005-01-15 03:47:06 +02:00
serg@serg.mylan
5ebcb21f12 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-14 19:51:29 +01:00
serg@serg.mylan
367bcf8c40 limit HEAP table size with max_heap_table_size, better estimation for mem_per_row 2005-01-14 19:49:45 +01:00
jimw@mysql.com
a66f6b79be Merge mysql.com:/home/jimw/my/mysql-5.0-6659 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-14 10:47:21 -08:00
ram@gw.mysql.r18.ru
4b3996d587 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
 2005-01-14 18:32:43 +04:00
ram@gw.mysql.r18.ru
e6510c896b A fix for bit type. 
pack_length_in_rec() func has been introduced.
 2005-01-14 18:24:32 +04:00
guilhem@mysql.com
2c6738cd7d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-14 15:06:53 +01:00
guilhem@mysql.com
8ee8543aa9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-14 15:02:05 +01:00
msvensson@neptunus.homeip.net
cb7524e103 Merge problem 
FC3 fix
 2005-01-14 14:33:26 +01:00
tomas@poseidon.ndb.mysql.com
843ef4fcc8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-14 14:30:30 +01:00
marko@hundin.mysql.fi
080869f995 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/k/mysql-4.1
 2005-01-14 15:23:34 +02:00
guilhem@mysql.com
5cafbb6838 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-14 14:23:34 +01:00
tomas@poseidon.ndb.mysql.com
fa57a72b9b added support for 'show status like 'Ndb%'' 
added number_of_replicas printout in show table status
 2005-01-14 12:32:33 +01:00
marko@hundin.mysql.fi
7ef8a20950 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/j/mysql-5.0
 2005-01-14 13:06:46 +02:00
guilhem@mysql.com
4c41a0d5e4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-14 11:32:17 +01:00
guilhem@mysql.com
980d1b658e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-14 10:59:37 +01:00
dlenev@mysql.com
8be6787640 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
 2005-01-14 10:09:01 +03:00
patg@patrick-galbraiths-computer.local
7c51cce029 progress in fixing multi-key, two-byte prefix keys. 2005-01-13 18:21:54 -08:00
jimw@mysql.com
3998da80e9 Output 'MEMORY' as table type for tables using the memory (nee heap) storage 
engine, except when running with sql_mode & MYSQL323. (Bug #6659)
 2005-01-13 17:38:13 -08:00
anjuta@arthur.local
a8e6b5e68c Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into arthur.local:/my/mysql-5.0-clean
 2005-01-14 01:17:01 +02:00
monty@mysql.com
2204baa5a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-14 00:10:03 +02:00
monty@mysql.com
249f914c21 Fix bug in INSERT DELAYED with prepared statements 
The bug was that if you have two TL_WRITE_DELAYED at the same time,
mi_lock_databases() could be done in the wrong order and we could write the wrong header to the MyISAM index file.
 2005-01-14 00:09:15 +02:00
patg@patrick-galbraiths-computer.local
5dd710a958 change to have_<> variable for federated engine 2005-01-13 13:03:05 -08:00
jimw@mysql.com
fdc16dc434 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 12:40:34 -08:00
guilhem@mysql.com
d6c99656b0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-13 21:36:28 +01:00
heikki@hundin.mysql.fi
94cc8442b0 ha_innodb.cc: 
"Add a comment why data modifying SQL statements MUST always use a locking read in tables that they read: otherwise the execution is not serializable, and in many cases is not well-defined; we also merged the associated bug fix from 4.1"
 2005-01-13 21:58:47 +02:00
anjuta@arthur.local
8f169155d1 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into arthur.local:/my/mysql-5.0-clean
 2005-01-13 21:56:18 +02:00
jimw@mysql.com
9b798253eb Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 11:50:10 -08:00
jimw@mysql.com
dcd75689d3 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 11:47:49 -08:00
heikki@hundin.mysql.fi
bdf26a4f9d Merge hundin.mysql.fi:/home/heikki/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-01-13 21:42:37 +02:00
monty@mysql.com
7c457a1bd7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-13 20:09:41 +02:00
heikki@hundin.mysql.fi
21666e4207 ha_innodb.cc: 
Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
 2005-01-13 20:08:28 +02:00
jani@ua141d10.elisa.omakaista.fi
83a57807e8 Applied a patch for Netware. 2005-01-13 19:46:46 +02:00
jimw@mysql.com
80c56602d3 Merge 2005-01-13 09:31:54 -08:00
tomas@poseidon.ndb.mysql.com
9f606fcfd8 To get correct values in SHOW TABLE STATUS 
Added pseudo column fragment memory
    changed ndb_get_table_statistics to take struct 
    and read row_size and fragment_memory
 2005-01-13 18:24:19 +01:00
jimw@mysql.com
7e1f47022c Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 09:24:07 -08:00
heikki@hundin.mysql.fi
76789a4c13 ha_innodb.cc: 
Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
 2005-01-13 19:20:49 +02:00
anjuta@arthur.local
224fcd4717 Merge 2005-01-13 19:14:10 +02:00
jimw@mysql.com
ce1cd9f0ee Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 09:09:46 -08:00
jimw@mysql.com
28ee2a67b3 Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 09:09:10 -08:00
jimw@mysql.com
73a9b29c3c Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 09:07:48 -08:00
jimw@mysql.com
7639e5afaf Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 09:07:21 -08:00
konstantin@mysql.com
9e10645cff Fix valgrind warning + post-merge fixes. 2005-01-13 19:03:21 +03:00
guilhem@mysql.com
c7c5cc80ad Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-13 15:59:48 +01:00
guilhem@mysql.com
a02601ecc5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-13 15:35:36 +01:00
konstantin@mysql.com
a676498977 manual merge 2005-01-13 17:31:49 +03:00
marko@hundin.mysql.fi
c5708e1d65 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
 2005-01-13 16:16:05 +02:00
bar@mysql.com
e3d6e6736b bug#7284: strnxfrm returns different results for equal strings 2005-01-13 18:12:04 +04:00
dlenev@mysql.com
52baee6346 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
 2005-01-13 14:46:41 +03:00
paul@kite-hub.kitebird.com
969b8ca5c4 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 20:39:04 -06:00
paul@kite-hub.kitebird.com
231632e34f user_limits.result: 
Fix test result affected by error message rewording.
errmsg.txt:
  Reword error messages.
set_var.cc:
  Reorder variables.
mysqld.cc:
  Reorder options.
 2005-01-12 20:38:05 -06:00
jimw@mysql.com
3d2481ba4a Fix small memory leak that occured when BerkeleyDB failed to initialize. 2005-01-12 17:20:43 -08:00
monty@mysql.com
b8dc0c5d93 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-13 03:03:41 +02:00
monty@mysql.com
de4ec3ed30 Fix accesses to uninitialized memory (found by valgrind) 2005-01-13 03:02:49 +02:00
jimw@mysql.com
0a3fba7f18 Small fix for Field_str::store() to avoid trying to read past beginning 
of log_10 array.
 2005-01-13 00:52:19 +01:00
jimw@mysql.com
51781b0bfc Fix conversion of floating point values to character fields when the 
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774)
 2005-01-13 00:41:45 +01:00