mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37648 commits 2784 branches 343 tags 1.6 GiB
Commit graph

2365 commits

Author SHA1 Message Date
andrey@lmy004.
7c049782fa WL #1034 (Internal CRON) 
merge before push
 2006-01-10 21:02:19 +01:00
svoj@april.(none)
1e8e3856da Fixed warnings. 2006-01-10 15:05:31 +04:00
msvensson@neptunus.(none)
d7a4c502fe Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
 2006-01-09 17:05:36 +01:00
msvensson@neptunus.(none)
0e7953d8b3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
 2006-01-09 15:31:38 +01:00
msvensson@neptunus.(none)
dad7268273 Add yassl libs to libmysqlclient_r as well. 
Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
Similiar to readline)
 2006-01-09 10:01:07 +01:00
serg@serg.mylan
923e7cfd73 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-01-07 14:50:03 +01:00
serg@serg.mylan
cfbaad9952 WL#2935 - SHOW STATUS support in plugins 
The patch adds DYNAMIC_ARRAY all_status_vars, which is now the
sole source of status information for SHOW STATUS.  Status
variables can be added to and removed from the array dynamically.
SHOW STATUS command uses this array instead of static array
from mysqld.cc
Compatibility with the old, global list of status variables is
preserved in init_server_components(), where this global list is
simply appended to all_status_vars.
 2006-01-07 14:41:57 +01:00
serg@serg.mylan
8dc77f267b merged 2006-01-06 18:26:59 +01:00
knielsen@mysql.com
b41bbfa564 Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-01-05 23:45:52 +01:00
knielsen@mysql.com
b197c9abea Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-01-05 23:41:10 +01:00
knielsen@mysql.com
71215d0cbc Port to Win64/x64 in Visual Studio 2005 2006-01-05 23:39:45 +01:00
knielsen@mysql.com
eed5285e8c Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-01-05 10:54:14 +01:00
knielsen@mysql.com
ed7c09da36 Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-01-05 10:45:34 +01:00
konstantin@mysql.com
f4cc6c4d15 Merge mysql.com:/opt/local/work/mysql-5.0-merge 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-01-05 00:38:51 +03:00
knielsen@mysql.com
f13dff7a72 EADDRINUSE is not defined on Windows. 2006-01-04 16:38:54 +01:00
msvensson@neptunus.(none)
2362c7314a Merge neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem 
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
 2006-01-04 16:34:03 +01:00
msvensson@neptunus.(none)
5bacd5067f Add yassl libs to libmysqlclient_r as well. 
Add a link to extra/yassl/include/openssl to inlude when compiling with yassl
Similiar to readline)
 2006-01-04 16:33:06 +01:00
konstantin@mysql.com
6502e6bba7 Merge mysql.com:/opt/local/work/mysql-4.1-7209-new 
into  mysql.com:/opt/local/work/mysql-5.0-merge
 2006-01-04 17:49:45 +03:00
konstantin@mysql.com
f7d6fa6f17 A fix for Bug#7209 "Client error with "Access Denied" on updates 
when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a 
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.
 2006-01-04 17:35:30 +03:00
holyfoot@mysql.com
42dd692212 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-04 14:28:41 +04:00
holyfoot@deer.(none)
e8697cf428 Big patch to make embedded-server working in 5.x 
Now it supports queries returning several results
(particularly important with the SP)
 2006-01-04 14:20:28 +04:00
serg@serg.mylan
8241a5a8e8 cleanup 2006-01-04 10:36:49 +01:00
serg@serg.mylan
30c09d6dc0 merged 2006-01-03 18:12:03 +01:00
serg@serg.mylan
14f94dc0ca many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
knielsen@mysql.com
03e47beb07 Compile fixes for aix52-64bit. 2006-01-01 22:18:02 +01:00
serg@serg.mylan
70d13a7cb7 plugin versioning: we cannot assume that sizeof(st_mysql_plugin) 
is the same in the plugin and in the mysqld.
store the size in the plugin.

To simplify access to plugin's st_mysql_plugin, copy it on open and
convert to the latest version, so that the rest of the code would
not need to care about versions.
 2006-01-01 16:43:34 +01:00
bar@mysql.com
6ff211329f WL#1324 table name to file name encoding 
- Encoding itself, implemented as a charset
  "filename". Originally planned to use '.'
  as an escape character, but now changed to '@'
  for two reasons: "ls" does not return
  file names starting with '.' considering them
  as a kind of hidden files; some platforms
  do not allow several dots in a file name.
- replacing many calls of my_snprintf() and
  strnxmov() to the new build_table_filename().
- Adding MY_APPEND_EXT mysys flag, to append
  an extention rather that replace it.
- Replacing all numeric constants in fn_format
  flag arguments to their mysys definitions, e.g.
  MY_UNPACK_FILENAME,
- Predictability in several function/methods:
  when a table name can appear with or withot .frm
  extension. Some functions/methods were changed
  so accept names strictly with .frm, other - strictly
  without .frm extensions. Several DBUG_ASSERTs were
  added to check whether an extension is passed.
Many files:
  table name to file name encoding
mysql_priv.h:
  Prototypes for new table name encoding tools.
ctype-utf8.c:
  Implementing "filename" charset for
  table name to file name encoding.
row0mysql.c:
  Fixing table name prefix.
mf_format.c:
  Adding MY_APPEND_EXT processing.
Many files:
  Fixing tests.
my_sys.h:
  Adding new flag to append rather than replace an extension.
m_ctype.h:
  Adding "filename" charset definition.
 2005-12-31 09:01:26 +04:00
serg@serg.mylan
a2689bae45 after pull fixes 2005-12-29 21:29:02 +01:00
joerg@mysql.com
59ea719936 Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0 2005-12-29 13:41:56 +01:00
kent@mysql.com
eaffb7eb73 config-win.h: 
Backported Windows MAX_INDEXES handling from 5.1
 2005-12-28 18:35:22 +01:00
svoj@mysql.com
a3f445151f WL#2575 - Fulltext: Parser plugin for FTS 
Manual merge.
 2005-12-28 16:05:30 +04:00
stewart@mysql.com
cac298e07b Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
 2005-12-28 13:55:59 +11:00
serg@serg.mylan
d5d6b51422 remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source 2005-12-24 14:32:50 +01:00
lars@mysql.com
ad126d90e0 WL#1012: All changes as one single changeset. 
This includes both code and test cases.
 2005-12-22 06:39:02 +01:00
acurtis@xiphis.org
9e3a6897c9 plugin version changes 2005-12-21 12:50:50 -08:00
acurtis@xiphis.org
9d4d1e81b8 Merge xiphis.org:/home/antony/work2/mysql-5.1 
into  xiphis.org:/home/antony/work3/mysql-5.1-plugable-2
 2005-12-21 10:26:39 -08:00
acurtis@xiphis.org
13a776778c Finalize storage engine plugins 
Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code
 2005-12-21 10:18:40 -08:00
bar@mysql.com
5f91dd6fad Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.xml
 2005-12-21 17:14:58 +04:00
bar@mysql.com
519f9d628c Adding XPath support: ExtractValue and UpdateXML functions. 
libmysqld/Makefile.am:
sql/Makefile.am:
  Adding new source files.
  Adding new file into build process.
include/my_xml.h:
strings/xml.c:
  Adding new XML parse flags to skip text normalization and 
  to use relative tag names. Adding enum for XML token types.
sql/lex.h:
  Making parser aware of new SQL functions.
sqll/item_create.h, sql/item_create.cc:
  Adding creators for ExtractValue and UpdateXML.
sql/item.h:
  Adding new Item types: nodeset and nodeset comparator.
sql/item_xmlfunc.h
sql/item_xmlfunc.cc
  Adding new classes implementing XPath functions.
mysql-test/t/xml.test, mysql-test/r/xml.result:
  New files: adding test case
 2005-12-21 17:13:52 +04:00
vtkachenko@melody.mysql.com
d1b5981693 Merge bk-internal:/home/bk/mysql-5.1-new 
into melody.mysql.com:/home/vadim/mysql-5.1-new
 2005-12-21 09:07:06 +01:00
vtkachenko@melody.mysql.com
22c930c924 Fast mutexes implementation 
(spin-loop inside pthread_mutex_lock).

thr_mutex.c:
  Added spinloop in mutex_lock
my_pthread.h:
  Added definition of my_pthread_fastmutex_t
configure.in:
  Added --with-fast-mutexes switch
 2005-12-20 14:56:45 +01:00
kent@mysql.com
6e276f03be my_sys.h: 
Added MAP_NORESERVE set to 0 for Windows
config-win.h:
  If MAX_INDEXES is not set, set it to 64 on Windows
 2005-12-19 23:23:53 +01:00
kent@mysql.com
b898368a93 my_global.h: 
Fix for bug #15841: Change in sql_map.cc and mmap breaks on HP-UX
  - in order to enable the mmap64() (and others) define
  _LARGEFILE64_SOURCE in case of _LARGEFILE_SOURCE defined on HPUX.
 2005-12-19 17:00:53 +01:00
vtkachenko@quadxeon.mysql.com
e9282ff3d0 Bug fix for bug #15843 "Added mmap support in myisam creates compile problem 
on AIX 5.2"

Added dummy definition of MAP_NORESERVE for systems which doesn't provide it,
removed duplicates

my_sys.h:
  added definition for MAP_NORESERVE
  (for Irix and AIX systems)
sql_map.cc:
  removed definition of MAP_NORESERVE
mi_packrec.c:
  removed definition of MAP_NORESERVE and MMAP_PRIVATE
 2005-12-19 14:16:21 +01:00
holyfoot@mysql.com
473580f085 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.clean
 2005-12-15 22:06:02 +04:00
holyfoot@mysql.com
c80ecb5501 Merge bk@192.168.21.1:mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.clean
 2005-12-15 21:00:14 +04:00
jonas@perch.ndb.mysql.com
2180197c9b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-15 15:11:42 +01:00
holyfoot@deer.(none)
dec0720a80 bug #15524 (partitioning range/list violation error message is insufficient) 2005-12-15 16:20:56 +04:00
joerg@trift-lap.fambruehe
0aaec93781 Merge joerg@trift2:/M50/part3-kent-joerg 
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
 2005-12-15 12:10:00 +01:00
ingo@mysql.com
340358481d Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0
 2005-12-14 18:20:19 +01:00
andrey@lmy004.
fd0613f59e Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl1034 
into lmy004.:/work/mysql-5.1-tt-copy-works
 2005-12-14 12:15:48 +01:00
ramil@mysql.com
fa5f802746 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/usr/home/ram/work/mysql-5.0-release
 2005-12-13 16:49:37 +04:00
ramil@mysql.com
8f1b038e72 Fix for bug#15209: MySQL installation problem on Windows ME. 2005-12-13 12:20:05 +04:00
kent@mysql.com
9f399bbabd my_pthread.h: 
Bug#15629: Increased thread stack for all 64 bit platforms,
  else test case 'sp' and 'call fib(20)' gives stack overrun
 2005-12-13 00:45:32 +01:00
andrey@lmy004.
d94bae3a21 WL#1034 update 
QUEUE implementation working now. this should be ready more or less
for testing once the debug output is being cleaned and some things
around DYNAMIC_ARRAY are cleaned
- fix handling in case of errors that lead to crashes, now no more crashes
  in case of table corruption and such.
 2005-12-12 21:19:19 +01:00
bar@mysql.com
9ac6e558d4 Bug#15375 Unassigned multibyte codes are broken 
into parts when converting to Unicode.
m_ctype.h:
  Reorganizing mb_wc return codes to be able
  to return "an unassigned N-byte-long character".
sql_string.cc:
  Adding code to detect and properly handle
  unassigned characters (i.e. the those character
  which are correctly formed according to the 
  character specifications, but don't have Unicode
  mapping).
Many files:
  Fixing conversion function to return new codes.
ctype_ujis.test, ctype_gbk.test, ctype_big5.test:
  Adding a test case.
ctype_ujis.result, ctype_gbk.result, ctype_big5.result:
  Fixing results accordingly.
 2005-12-12 21:42:09 +04:00
ingo@mysql.com
270cad2f63 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug10932
 2005-12-07 19:47:55 +01:00
pem@mysql.com
8e0e421943 Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-12-07 15:17:18 +01:00
ingo@mysql.com
b5005d4171 Merge mysql.com:/home/mydev/mysql-5.0-bug10932 
into  mysql.com:/home/mydev/mysql-5.1-bug10932
 2005-12-06 08:31:38 +01:00
ingo@mysql.com
a588622a66 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug10932
 2005-12-06 08:19:23 +01:00
serg@serg.mylan
e5e22395c9 compatibility define for Bug#15293 2005-12-05 20:47:15 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
715becac5b Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-12-05 10:24:54 +02:00
kent@mysql.com
9fd13ba93d my_global.h: 
Make __cxa_pure_virtual weak symbol
 2005-12-03 20:52:34 +01:00
ingo@mysql.com
6b18dbef31 Bug#10932 - Building server with key limit of 128, makes test cases fail 
Allow for configuration of the maximum number of indexes per table.
Added and used a configure.in macro.
Replaced fixed limits by the configurable limit.
Limited MyISAM indexes to its hard limit.
Fixed a bug in opt_range.cc for many indexes with InnoDB.

Tested for 2, 63, 64, 65, 127, 128, 129, 255, 256, and 257 indexes.
Testing this part of the bugfix requires rebuilding of the server 
with different options. This cannot be done with our test suite. 
Therefore I added the necessary test files to the bug report.
If you repeat the tests, please note that the ps_* tests fail for
everything but 64 indexes. This is because of differences in the 
meta data, namely field lengths for index names etc.
 2005-12-02 16:27:18 +01:00
andrey@lmy004.
a370c2d907 WL1034 update for latest 5.1 sources 2005-12-02 13:07:02 +01:00
vtkachenko@quadxeon.mysql.com
045747f23d Many files: 
Added mmap support for MyISAM engine
 2005-12-01 13:34:48 +01:00
bar@mysql.com
23c4c3abc0 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2005-11-29 09:30:29 +04:00
pem@mysql.com
b2a9961abf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-11-28 20:14:12 +01:00
knielsen@mysql.com
ce63d425b2 Merge mysqldev@production:my/mysql-4.1.16-fixes 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2005-11-28 16:29:07 +01:00
knielsen@mysql.com
9248dfc840 Minor Win32 compile fixes for 4.1.16 release. 2005-11-28 15:07:20 +01:00
serg@serg.mylan
122b597fc3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-26 08:56:59 +01:00
serg@serg.mylan
10df921c96 documenting HA_STATUS_xxx flags 2005-11-26 08:54:13 +01:00
konstantin@mysql.com
9fd6204ad1 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-25 13:57:13 +03:00
monty@mysql.com
1502692322 Added bitmap_buffer_size() 
Removed valgrind warnings when using not aligned bitmap buffer size
Added setting of thread_stack
 2005-11-24 06:15:35 +02:00
monty@mysql.com
aa37b75768 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-24 02:56:12 +02:00
monty@mysql.com
f5804869e3 Don't use PATH_MAX for FN_REFLEN as this uses too much stack space 
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk
 2005-11-24 02:36:28 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-11-23 14:57:00 +02:00
pappa@c-5608e253.1238-1-64736c10.cust.bredbandsbolaget.se
50abd6c542 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  c-5608e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
 2005-11-22 12:16:22 -05:00
msvensson@neptunus.(none)
9301123eb3 Bug #14514 Creating table with packed key fails silently 
- Backport from 5.0
 2005-11-21 12:27:58 +01:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
guilhem@mysql.com
24006266d0 Merge mysql.com:/home/mysql_src/mysql-5.0-van 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
 2005-11-19 10:43:28 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
ingo@mysql.com
74781d6559 Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash 
Version for 5.0.
It fixes three problems:
1. The cause of the bug was that we did not check the table version for
 the HANDLER ... READ commands. We did not notice when a table was
 replaced by a new one. This can happen during ALTER TABLE, REPAIR
 TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
 for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
 Though the function comment clearly said it must.
 I changed the code so that the locking is done when required. I call
 the fix for this problem "the secondary fix".
3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in
 concur with FLUSH TABLES WITH READ LOCK. I call the fix for this
 problem "the 5.0 addendum fix".
 2005-11-15 21:57:02 +01:00
SergeyV@selena.
450909f0d3 Merge selena.:H:/MYSQL/bkt/mysql-5.0-rel 
into  selena.:H:/MYSQL/bkt/mysql-5.0
 2005-11-14 16:16:29 +03:00
SergeyV@selena.
00990f9774 Fixes bug #13377. my_open() & my_create() functions changed to use 
my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to 
allow deleting opened files. my_sopen() implementation is added to
support this functionality.
 2005-11-14 16:01:10 +03:00
kent@mysql.com
7966c4ddac config-win.h: 
Disabled yaSSL support for now
 2005-11-14 04:07:24 +02:00
pappa@c-5608e253.1238-1-64736c10.cust.bredbandsbolaget.se
4282ad92cb Bug #12796: Record lost in HEAP table 
Two handler objects were present, one was used for an insert and the other for a select
The state of the statistics was local to the handler object and thus the other handler
object didn't notice the insert.
Fix included:
1) Add a new variable key_stat_version added to whenever statistics was considered in need
of update (previously key_stats_ok= FALSE in those places)
2) Add a new handler variable key_stat_version assigned whenever key_stats_ok= TRUE was set
previously
3) Fix records_in_range to return records if records <= 1
4) Fix records_in_range to add 2 to rec_per_key to ensure we don't specify 0 or 1 when it isn't
and thus invoking incorrect optimisations.
5) Fix unique key handling for HEAP table in records_in_range
 2005-11-08 00:26:37 -05:00
svoj@poseidon.ndb.mysql.com
eed744d30b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2005-11-06 16:16:18 +01:00
svoj@poseidon.ndb.mysql.com
463811e900 monty review: fixes after reapplying plugin patch from "crashed" 5.1 tree 2005-11-06 14:26:37 +01:00
svoj@poseidon.ndb.mysql.com
3791197f0d WL#2575 - Fulltext: Parser plugin for FTS 
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
 2005-11-06 13:13:06 +01:00
ramil@ndbmaster.mysql.com
bd18c9f24d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into ndbmaster.mysql.com:/home/ndbdev/tomas/mysql-5.1-new
 2005-11-06 08:30:26 +01:00
ramil@ndbmaster.mysql.com
7678149864 WL #528: Faster free_tmp_table 2005-11-06 08:29:03 +01:00
kent@mysql.com
37788da790 Reapplied portability changes, from changesets by kent, joerg and msvensson 2005-11-06 02:19:51 +01:00
monty@mysql.com
d9a687758c Added inclusion of dlfcn.h from old 5.1 tree 2005-11-05 14:10:48 +02:00
monty@mysql.com
cdf64f0f57 Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree) 
This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
 2005-11-05 13:20:35 +02:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-05 01:32:55 +02:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-04 01:15:35 +01:00
msvensson@neptunus.(none)
8e7dfad543 BUG#14514 Creating table with packed key fails silently 2005-11-02 15:53:04 +01:00
sergefp@mysql.com
09a4d0c7a7 4.1->5.0 merge 2005-10-29 02:36:57 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
1fdee50f16 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-10-28 14:04:06 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
28cb5aefcf NetWare specific change to use a LibC API instead of a 
kernel function to prevent CPU hogs.
 2005-10-28 14:01:00 +03:00
jani@ua141d10.elisa.omakaista.fi
74b8b449a4 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-28 03:26:56 +03:00
kent@mysql.com
a49940c359 Makefile.am: 
Added "base64.h" to enable "make dist" to work
 2005-10-28 02:17:41 +02:00
jani@ua141d10.elisa.omakaista.fi
cbe21a8eb6 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-27 23:43:20 +03:00
reggie@big_geek.
dec2640dbf changed define from EXTERN_C to EXTERNC so it doesn't conflict with 
another macro defined in the Windows header files.
 2005-10-25 23:51:05 -05:00
jani@ua141d10.elisa.omakaista.fi
3e599c0907 Imported fixes from 4.1 and 5.0 to 4.0. 2005-10-25 16:56:25 +03:00
monty@mysql.com
3e653fb922 Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization 2005-10-25 02:27:40 +03:00
lars@mysql.com
827d745c89 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
 2005-10-24 20:03:40 +02:00
sergefp@mysql.com
ea3ea9ed10 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2
 2005-10-23 02:49:57 +04:00
sergefp@mysql.com
e3f623d6e8 BUG#9622: post-review-fixes: better comments 2005-10-23 02:46:10 +04:00
sergefp@mysql.com
15a78334c3 BUG#9622, stage 2, work together with fix for BUG#12232: 
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).
 2005-10-21 06:29:17 +04:00
lars@mysql.com
0abcffcb5d WL#2835: Base64 mysys functions 2005-10-14 01:14:23 +02:00
bar@mysql.com
fee9c13568 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 22:18:35 +05:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-13 18:23:53 +03:00
bar@mysql.com
c229567887 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 19:19:05 +05:00
bar@mysql.com
39b0712cf7 type_binary.result, type_binary.test: 
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.
 2005-10-13 19:16:19 +05:00
ramil@mysql.com
2ffbe01127 Merge mysql.com:/usr/home/ram/work/mysql-4.0 
into  mysql.com:/usr/home/ram/work/mysql-4.1
 2005-10-13 12:48:30 +05:00
guilhem@mysql.com
621e28cbe1 Building with compile-pentium-valgrind-max (without safemalloc) defines my_free() without flags, 
so a typo on flags will go unnoticed; I put flags in this my_free() definition (as a no-op which
will still make the compiler check correctness of the flags). Applied: this caught a typo in my_realloc.c. Kindly approved by Konstantin and Mats.
 2005-10-13 00:24:14 +02:00
ramil@mysql.com
58c64aea92 memcpy_overlap() removed, as 
1. it's wrong to use memcpy() for overlapped areas;
  2. we use it only once.
During merge to 4.1 will remove a memcpy_overlap() call 
from strings/ctype-tis620.c as well in order to fix 
bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64.
 2005-10-12 18:50:25 +05:00
monty@mysql.com
5513ab69b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-12 00:59:52 +03:00
monty@mysql.com
f5fdf3e87a Reviewing new pushed code 
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
 2005-10-12 00:58:22 +03:00
jimw@mysql.com
c8a6c2c614 Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how 
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731)
 2005-10-11 09:12:12 -07:00
serg@serg.mylan
2e2d18b7cf Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2005-10-09 19:10:19 +02:00
serg@serg.mylan
e91712d9bb pthread_handler_decl() changed to be ctags-friendly 
(and contain extern "C" when necessary)
 2005-10-08 16:39:55 +02:00
monty@mysql.com
17d7ba931d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-08 03:37:23 +03:00
monty@mysql.com
78e828d32f Review of code pushed since last 5.0 pull: 
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
 2005-10-06 17:54:43 +03:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
kent@mysql.com
3af12c4776 my_pthread.h: 
Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'
 2005-10-06 03:49:14 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ae745ef283 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
 2005-09-30 15:29:01 +03:00
jonas@perch.ndb.mysql.com
b43d0f0495 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-30 12:25:39 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
aa08fd0d0a Small fixes. 2005-09-30 12:35:12 +03:00
jonas@perch.ndb.mysql.com
21153069fb export forced_defaults_file using global variable defaults_file 
analog with defaults_extra_file and defaults_grouop_suffix
 2005-09-30 09:54:53 +02:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in: 
Enable "make distcheck" to work
 2005-09-24 15:51:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
acf218b708 Several fixes revelaled by Intel compiler. 2005-09-23 16:47:08 +03:00
konstantin@mysql.com
2d4c54ba1b Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-09-23 00:46:59 +04:00
konstantin@mysql.com
6f8d3c4844 A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and 
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
 2005-09-22 02:11:21 +04:00
serg@serg.mylan
3b41e3362b aftermerge fix 2005-09-21 17:38:26 +02:00
serg@serg.mylan
a083ff160e merged 2005-09-21 13:53:22 +02:00
sergefp@mysql.com
a26e1b7280 Merge mysql.com:/home/psergey/bk-trees/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
 2005-09-21 02:20:55 +04:00
sergefp@mysql.com
f9475d1d15 BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index 
statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)
 2005-09-21 02:18:29 +04:00
SergeyV@selena.
c2f734ce42 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  selena.:H:/MYSQL/src/#12929-mysql-4.1
 2005-09-20 20:11:38 +04:00
bar@mysql.com
6424e9cce1 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b10504
 2005-09-19 09:46:25 +05:00
joerg@mysql.com
f67c7186e8 Merge the 5.0.13 clone changes up to 5.1 2005-09-16 11:02:21 +02:00
bar@mysql.com
1d12ac8849 Bug#10504 
Character set does not support traditional mode
ctype_utf8.result, ctype_utf8.test:
  adding test case.
password.c, mysql_com.h
  Changeing octet2hex availability from static to public.
item_strfunc.cc:
  Result string is now checked to be well-formed.
  Warning/error is generated, depending on sql_mode.
 2005-09-16 10:24:37 +05:00
SergeyV@selena.
2e9e0b33c5 Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating 
a restriction to 255 chars for editable buffer.
 2005-09-16 01:56:16 +04:00
joerg@mysql.com
8b7b6f46f3 Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by Kent) 2005-09-15 19:00:25 +02:00
msvensson@neptunus.(none)
10eee79363 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-15 11:32:49 +02:00
ingo@mysql.com
18cb2e8388 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-14 13:37:16 +02:00
ingo@mysql.com
6e725adc00 Bug#12920 - key_read_requests counter appears to re-set 
After merge fix.
 2005-09-14 13:18:16 +02:00
ingo@mysql.com
8130641e8e Merge mysql.com:/home/mydev/mysql-4.0-4000 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-14 10:34:41 +02:00
ingo@mysql.com
7314307762 Bug#12920 - key_read_requests counter appears to re-set 
Enlarged the counter variables to ulonglong.
 2005-09-14 09:56:49 +02:00
msvensson@neptunus.(none)
6da41af772 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
 2005-09-14 09:45:44 +02:00
msvensson@neptunus.(none)
7fb9d5aaa0 Fix QNX warning 2005-09-14 08:33:00 +02:00
ndbdev@dl145c.mysql.com
4e8595862d Merge 2005-09-13 05:33:11 +02:00
jimw@mysql.com
a60ed0b75d Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-12 17:00:50 -07:00
jimw@mysql.com
d7dc2f68db Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-09-12 12:47:45 -07:00
jimw@mysql.com
16e5f22162 Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-09-12 10:19:56 -07:00
joerg@mysql.com
54ceb62b8d Merge mysql.com:/M40/clone-4.0 into mysql.com:/M40/upward-4.0 2005-09-08 11:04:43 +02:00
jimw@mysql.com
a540a66b26 Port to SCO OpenServer 6. May require running ./configure with 
--build=i686-unknown-sysv5SCO_SV6.0.0
 2005-09-07 20:23:07 +02:00
SergeyV@selena.
784582b857 Merge selena.:H:/MYSQL/src/#05588-mysql-4.0 
into  selena.:H:/MYSQL/src/#05588-mysql-4.1
 2005-09-07 14:59:41 +04:00
ndbdev@dl145c.mysql.com
f40c1576b0 Merge 2005-09-06 09:20:15 +02:00
jimw@mysql.com
3be42aabc5 Merge mysql.com:/home/jimw/my/mysql-5.0-11787 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-03 09:34:34 -07:00
kent@mysql.com
5b65d8fb03 my_global.h: 
Back port of QNX work around for rint()
 2005-09-02 11:11:29 +02:00
msvensson@neptunus.(none)
345dfef41f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-02 08:59:59 +02:00
jimw@mysql.com
d6db387aea Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-31 19:12:16 -07:00
jimw@mysql.com
c3f4ecb544 Merge mysql.com:/home/jimw/my/mysql-4.1-7156 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-31 18:34:16 -07:00
jimw@mysql.com
1d997477aa Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-31 15:24:06 -07:00
ndbdev@dl145b.mysql.com
583979d949 merge 2005-08-31 20:45:48 +02:00
jimw@mysql.com
37bf8394ab Add test for madvise() being declared in C++ code, because it is not 
on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156)
 2005-08-31 10:08:55 -07:00
jimw@mysql.com
0dc444ec4e Fix incorrect spellings of "dropped" in source and tests. (Bug #12828) 2005-08-30 12:24:37 -07:00
SergeyV@selena.
3fdd500288 Fixes bug #11815. Convert file path to UNIX format to build correct query 
string while replicating LOAD DATA INFILE statement.
 2005-08-30 22:19:15 +04:00
SergeyV@selena.
e82e15b051 Fixes bug #5588. vio_was_interrupted() function was added to detect 
read timeout properly on win32.
 2005-08-30 19:19:28 +04:00
kent@mysql.com
64c2d24978 libmysqld.vcproj: 
Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
  Aligned engines with Unix version
sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does
 2005-08-25 23:24:43 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-25 13:11:38 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03:00
monty@mishka.local
49413542bd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-08-22 16:06:00 +03:00
monty@mishka.local
d62295e44e Cleanup during review of new pushed code 2005-08-22 01:13:37 +03:00
elliot@mysql.com
55b81af671 Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/home/emurphy/src/work/mysql-5.0
 2005-08-19 15:29:30 -04:00
elliot@mysql.com
d9efe655ed Bug#11338 Fixes from review (identical functionality). 2005-08-19 14:49:34 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
c6ee26ab45 Some minor fixes for Netware. These were required after we started building 
against a later version of libc.
 2005-08-18 21:26:25 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3bfa514655 Changes for Netware. This is needed when building against newer Libc 
than we've used before.
 2005-08-18 21:22:35 +03:00
jimw@mysql.com
a3ae4e0fc7 Fix up definition of new set_timespec_nsec() macro. (Related to bug #12582) 2005-08-17 18:08:30 -07:00
elliot@mysql.com
1664e31f12 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338
 2005-08-17 04:32:29 -04:00
elliot@mysql.com
197782605f BUG#11338 (logging of prepared statement w/ blob type) 
In cp932, '\' character can be the second byte in a 
multi-byte character stream. This makes it difficult to use
mysql_escape_string. Added flag to indicate which languages allow
'\' as second byte of multibyte sequence so that when putting a prepared
statement into the binlog we can decide at runtime whether hex encoding
is really needed.
 2005-08-17 04:26:32 -04:00
jimw@mysql.com
054e78943e Fix SLEEP() to be interruptable. (Bug #12582) 2005-08-16 16:31:16 -07:00
jimw@mysql.com
a3eaf4eec2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:37:45 -07:00
acurtis@xiphis.org
b9476f7d50 Merge xiphis.org:/usr/home/antony/work2/mysql-4.1 
into  xiphis.org:/usr/home/antony/work2/merge-5.0
 2005-08-11 12:18:53 +01:00
jimw@mysql.com
194360397c Rename rest() macro in my_list.h to list_rest(). (Bug #12327) 2005-08-09 18:02:36 -07:00
bar@mysql.com
a856f155c6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b5439
 2005-08-09 09:07:12 +05:00
bar@mysql.com
281c8ec163 Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passed 
(important for Adobe).

mf_pack.c, mf_dirname.c, charset.c, my_sys.h:

  - adding fs_character_set() function on Windows
  - ignoring fake slashes which are just multibyte
    parts in several functions in /mysys

Verified by Shu to work on WinXP and Win2k.
Test is not possible, or very hard to do.
 2005-08-08 19:52:30 +05:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-05 18:01:34 -04:00
jimw@mysql.com
97797d91fb Merge mysql.com:/home/jimw/my/mysql-5.0-7003 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-02 16:50:09 -07:00
reggie@fedora.(none)
25e204debb fix compile warning in Visual Studio 2003 2005-08-01 17:07:19 -05:00
monty@mishka.local
585da2f6fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-31 21:09:18 +03:00
monty@mishka.local
8437e9c1be Fixes during review of new pushed code 
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
 2005-07-31 12:49:55 +03:00
igor@rurik.mysql.com
f4c1b3bae4 Merge 2005-07-31 02:44:18 -07:00
georg@lmy002.wdf.sap.corp
10615d54fb fix for bug#12665 
macro floatget was missing in config-win.h
 2005-07-29 14:51:08 +02:00
monty@mysql.com
15d48525af Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2005-07-28 17:09:54 +03:00
monty@mysql.com
24d45c5c30 Merge mysql.com:/home/my/mysql-4.0 
into  mysql.com:/home/my/mysql-4.1
 2005-07-27 13:24:59 +03:00
monty@mysql.com
4098c40d87 Review fixes: 
Fixed portability problem with bool in C programs
Moved close_thread_tables out from LOCK_thread_count mutex (safety fix)
my_sleep() -> pthread_cond_timedwait()
 2005-07-26 17:55:58 +03:00
bar@mysql.com
0255803b4e Merge mysql.com:/usr/home/bar/mysql-4.1.b10201 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-26 13:25:18 +05:00
jani@a193-229-222-105.elisa-laajakaista.fi
ca0803a024 Undefined RINT for Netware. 2005-07-23 01:11:29 +03:00
jimw@mysql.com
6e955625f6 Merge mysql.com:/home/jimw/my/mysql-5.0-build 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:36:17 -07:00
joerg@mysql.com
306ade1fd5 Add the definition of "floatget". 
Necessary to compile 5.0.10 on Windows, no bug report filed.
 2005-07-22 20:37:59 +02:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
e44ee76453 Included partitioning into embedded server 2005-07-21 03:31:49 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
1ff1301d75 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-07-21 02:37:23 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6026054ead Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-07-21 01:29:57 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9663b9a974 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
 2005-07-20 21:58:33 -04:00
tulin@dl145b.mysql.com
c2c0cb18c3 no PARTITION in embedded server 2005-07-20 16:05:47 +02:00
georg@lmy002.wdf.sap.corp
dc0645f7cf Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1
 2005-07-20 13:32:43 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f7639ba15 Added some missing casts and changed a define for alloca(). 2005-07-20 13:27:57 +03:00
tulin@dl145b.mysql.com
bf6e3f9aa8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-20 07:53:10 +02:00
jimw@mysql.com
d7fbff3ec5 Merge mysql.com:/home/jimw/my/mysql-5.0-5906 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:34 -07:00
jimw@mysql.com
2a06e5756e Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:32 -07:00
tulin@dl145b.mysql.com
a6c21a0791 merge 2005-07-19 21:56:10 +02:00
konstantin@mysql.com
14344b658a A fix and a test case for Bug#10760 and complementary cleanups. 
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same 
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
 2005-07-19 22:21:12 +04:00
jimw@mysql.com
80c1c6b33f Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 11:05:49 -07:00
monty@mishka.local
7e83d09ce7 Simple fixes during review of new code 2005-07-19 19:25:05 +03:00
georg@lmy002.wdf.sap.corp
21a88afeed minor fix (backport from 5.0) - changed function prototype/definition 2005-07-19 17:12:00 +02:00
ingo@mysql.com
ec15dda2bf Bug#10932 - Building server with key limit of 128, makes test cases fail 
This patch allows to configure MyISAM for 128 indexes per table.
The main problem is the key_map, wich is implemented as an ulonglong.
To get rid of the limit and keep the efficient and flexible
implementation, the highest bit is now used for all upper keys.
This means that the lower keys can be disabled and enabled 
individually as usual and the high keys can only be disabled and
enabled as a block. That way the existing test suite is still
applicable, while more keys work, though slightly less efficient.
To really get more than 64 keys, some defines need to be changed.
Another patch will address this.
 2005-07-19 14:13:56 +02:00
jimw@mysql.com
dd2f631ec4 Fix number to date conversion so it always honors the NO_ZERO_DATE, 
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906)
 2005-07-18 16:12:44 -07:00
mronstrom@mysql.com
2d23c691f7 Bug #10600 
remove_table_from_cache fails to signal other thread and gets
blocked when other thread also gets blocked
 2005-07-19 00:29:19 +02:00
monty@mishka.local
21ae963205 Fixes to previous changeset 
get_defaults_file() -> get_defaults_options()
 2005-07-18 20:05:30 +03:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc Cleanups during review 
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
 2005-07-18 15:33:18 +03:00
mronstrom@mysql.com
67087e2aa7 Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
georg@lmy002.wdf.sap.corp
53c630a524 Restore previous used client charset in mysql_reconnect 
Moved mysql_set_character_set function to client.c
Changed function prototype for mysql_set_character_set (as suggested
by Konstantin)
 2005-07-16 07:13:40 +02:00
tomas@poseidon.ndb.mysql.com
1affa6182a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
 2005-07-13 13:11:51 +02:00
lars@mysql.com
6db2602ad0 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-13 02:13:04 +02:00
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00
reggie@linux.site
c31d71c065 Fixed some vio code that was using ___WIN__ instead of __WIN__ 2005-07-12 10:31:09 -06:00
mskold@mysql.com
2dd4dd9291 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-12 11:46:53 +02:00
georg@lmy002.wdf.sap.corp
55d413252f changes after Bar's review: renamed CHARACTER_SET to MY_CHARSET_INFO 2005-07-12 10:58:21 +02:00
mskold@mysql.com
f741566646 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-12 10:57:01 +02:00
georg@lmy002.wdf.sap.corp
ceba4ee9cd New attempt after Bar's review 
Added api function mysql_get_character_set_info which provides
information about the current client character set.
 2005-07-12 10:31:43 +02:00
brian@avenger.(none)
0c5ac2dd5b Fix for gcc 4.0 (they have removed min/max operators). 2005-07-11 16:56:18 -07:00
jimw@mysql.com
bef1c77789 Make it possible to change reconnect setting with 
mysql_options(..., MYSQL_OPT_RECONNECT, ...). (Bug #11787)
 2005-07-06 16:29:31 -07: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
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
bell@sanja.is.com.ua
d3905f3d0e Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
konstantin@mysql.com
f60ebc4815 A fix and a test case for Bug#10794 "mysql_stmt_attr_set no 
open cursor after mysql_stmt_execute" + post-review fixes.
The bug was caused by wrong flags in stmt->server_status on the client
side: if there was no cursor, the server didn't send server_status
flags to the client, and the old flags were used to set up the
fetch function of a statement. Consequently, stmt_read_row_from_cursor was
used when there was no cursor. The fix fixes the server to always
send server flags to the client.
 2005-06-30 16:17:10 +04:00
marty@linux.site
e4aedcc2c1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  linux.site:/home/marty/MySQL/mysql-5.0
 2005-06-30 12:20:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3df73db1cf Applied some Netware related patches. 2005-06-29 14:02:11 +03:00
jimw@mysql.com
409592e652 Add my_str_malloc and _free function pointers to strings library 
which will by default exit(1) if malloc() fails, but can be set
to do something else by the calling program does, which mysqld
does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks
allocation in conf_to_src utility program. (Bug #7003)
 2005-06-24 13:41:33 -07:00
ingo@mysql.com
ef6d371113 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-bug8321
 2005-06-24 19:47:20 +02:00
ingo@mysql.com
1c33fbc4c1 Bug#10178 - failure to find a row in heap table by concurrent UPDATEs 
Bug#10568 - Function 'LAST_DAY(date)' does not return NULL for invalid argument.
Manual merge.
 2005-06-24 19:47:18 +02:00
ingo@mysql.com
e81358565b Bug#8321 - myisampack bug in compression algorithm 
Added 64-bit extensions, comments, extended statistics 
and trace prints.
 2005-06-24 19:34:55 +02:00
ramil@mysql.com
66330a9d59 an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h). 2005-06-24 12:51:11 +05:00
jimw@mysql.com
3ccb90c085 Make status of NO_BACKSLASH_ESCAPES mode known to the client so 
it can use it to switch to only quoting apostrophes by doubling
them when it is in effect. (Bug #10214)
 2005-06-23 18:29:56 -07:00
tulin@dl145b.mysql.com
ebc2050c25 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-17 23:13:38 +02:00
konstantin@mysql.com
b3d977df10 Rename all prepared statements COM_ commands to prefix with COM_STMT_ 2005-06-17 23:26:25 +04:00
joreland@mysql.com
59ce529b15 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into mysql.com:/home/jonas/src/mysql-5.1
 2005-06-13 15:16:15 +02:00
joreland@mysql.com
84a04b4a9d merge 2005-06-13 14:09:09 +02:00
joreland@mysql.com
5e4ce743a3 Merge mysql.com:/home/jonas/src/wl1882 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-13 11:59:51 +02:00
kent@mysql.com
811e51ec84 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-10 20:12:45 +02:00
ndbdev@dl145b.mysql.com
8d44b54295 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-10 07:22:27 +02:00
jimw@mysql.com
a5285b141e Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-09 18:00:47 -07:00
kent@mysql.com
4d0a81aa8b config-win.h: 
Enabled yaSSL on Windows
Many files:
  Added yaSSL to Visual Studio 6 project files
 2005-06-09 05:04:59 +02:00
svoj@mysql.com
f9751e1785 Merge mysql.com:/var/tmp/sslbug/mysql-4.0 
into mysql.com:/var/tmp/sslbug/mysql-4.1
 2005-06-08 21:40:58 +05:00
svoj@mysql.com
cc31c4c7fb Fix for 
BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
Remove obsolete code.
 2005-06-08 21:07:25 +05:00
svoj@mysql.com
7e44f6f591 WL#2466 - Fulltext: "always-index" words 
Trie and Aho-Corasick code added to distribution.
 2005-06-07 21:17:09 +05:00
joreland@mysql.com
5be3eecc42 Add "--instance=name" option to load_defaults (or env(MYSQL_INSTANCE)) 
which enables having multiple mysqld in same my.cnf 
       without mysql_multi or IM
 2005-06-07 16:52:50 +02:00
ndbdev@dl145b.mysql.com
2fb1fb5877 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-07 06:50:50 +02:00
ndbdev@dl145b.mysql.com
161a58ab4b merge 2005-06-06 23:39:19 +02:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
ea7f982ef0 Some fixes for Netware. 2005-06-06 18:30:59 +03:00
bar@mysql.com
2df945d87b Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 
UPPER/LOWER now can return a string with different length.

mi_test1.c:
  Adding new arguments.
Many files:
  Changeing caseup/casedn to return a result with different
  length than argument.
sql_string.h:
  Removing unused method,
mysql_priv.h:
  Removing unused method
 2005-06-06 16:54:15 +05:00
mronstrom@mysql.com
d316bc88d8 Patch for bugs in bitmap (endian issue) 2005-06-06 08:59:00 +02:00
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before* 
'#pragma interface' (that comes with the #include'd header file)
 2005-06-05 19:38:52 +02:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4 Merge 2005-06-04 19:26:35 +02:00
serg@serg.mylan
aaa4c11d11 mergemerged 2005-06-03 21:24:13 +02:00
serg@serg.mylan
e4d4baed62 merged 2005-06-03 18:29:36 +02:00
lenz@mysql.com
852a57300d - include/config-win.h: removed double HAVE_CHARSET_cp932 #define 
- mysql-test/Makefile.am: added a pattern match for t/*.sql 
  (t/mysql_delimiter.sql was missing from the source distribution)
 2005-06-03 18:20:25 +02:00
serg@serg.mylan
f55a378e9a *don't* mess with kernel defines, boy. 
and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure
 2005-06-03 15:05:18 +02:00
tomas@poseidon.ndb.mysql.com
8d4a10977a changed name of my_bitmap member since it has a different meaning than in 5.0 2005-06-02 22:10:57 +02:00
tomas@poseidon.ndb.mysql.com
644906bf9c bitmap bug fixes and interface change 2005-06-02 18:40:25 +02:00
serg@serg.mylan
cdb1474dae Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-02 15:46:55 +02:00
schwenke@lmy003.xl.local
7d6b47c994 misc. fixes for windoze builds 2005-06-02 15:32:02 +02:00
serg@serg.mylan
f3a95357fe Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-02 11:02:01 +02:00
tomas@poseidon.ndb.mysql.com
925548d349 Merge 2005-06-02 00:51:30 +02:00
lenz@mysql.com
9afd2563e9 Merge of 4.1 -> 5.0 2005-06-01 15:11:14 +02:00
serg@serg.mylan
6e37d8c15d FIELD_TYPE_NEWDECIMAL is numeric too 2005-06-01 09:32:05 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09 Merge 2005-05-31 14:37:47 +02:00
lenz@mysql.com
53e49d0521 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-05-27 09:52:03 +02:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02:00
msvensson@neptunus.(none)
975ca22872 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-26 12:10:05 +02:00
msvensson@neptunus.(none)
83d430353e Add ifdefs to control when "#pragma implementation" should be used 
Added some more ifdefs for "#pragma interface"
 2005-05-26 12:09:14 +02:00
lenz@mysql.com
c58535f6d3 - merged the 4.1.12a Changes back into the main tree 2005-05-26 11:43:47 +02:00
monty@mysql.com
6d5d6c9257 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-05-25 12:57:29 +03:00
monty@mysql.com
fb90aaa7b5 Cleanup during code review 
Faster detection of wrong table names (like PRN) on windows
 2005-05-25 12:56:47 +03:00
serg@serg.mylan
e2c8f63ed4 simplifying new/my_arg_new wrapping 2005-05-24 21:02:42 +02:00
lenz@mysql.com
236ca3626f - added the cp932 charset support to the Windows builds 2005-05-24 14:46:28 +02:00
msvensson@neptunus.(none)
197978e3d1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
 2005-05-23 19:01:16 +02:00
msvensson@neptunus.(none)
548994aa7b Build fixes for icc, compile _without_ "-no-gnu" 2005-05-23 18:53:53 +02:00
msvensson@neptunus.(none)
9d0e3521f0 Build fix 2005-05-23 15:13:21 +02:00
ndbdev@dl145c.mysql.com
30def9f3f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-23 10:45:48 +02:00
reggie@mdk10.(none)
21133df02a fixed conflicts 2005-05-20 16:34:59 -05:00
reggie@mdk10.(none)
48c584537d BUG# 9148: Denial of service 
The problem was that on Windows the access method indicates that access to file 
such as "com1" and "lpt1" is allowed (since they are device names) and
this causes mysql to attempt to open them as databases or tables.

The fix was to write our own my_access method that uses other Win32 functions
to determine if the given argument is indeed a file and has to requested
mode.
 2005-05-20 16:04:10 -05:00
bell@sanja.is.com.ua
e37fbf2382 Macos 10.4 compatibility changes 2005-05-20 16:21:23 +03:00
ndbdev@dl145c.mysql.com
4b47828478 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-19 18:37:33 +02:00
konstantin@mysql.com
f30f95183b Change the return type back to int (modify_defaults_file). 
This fixes a compilation failure in mysql_com.h, which doesn't have
'uint' alias visibile. Maybe worth while changing to unsigned int, but
the rest of functions that work with defaults files return int.
 2005-05-19 14:02:12 +04:00
tulin@dl145c.mysql.com
be861a7ccf merge 2005-05-19 09:04:24 +02:00
tulin@dl145c.mysql.com
03590c20bd merge 2005-05-18 22:26:23 +02:00
monty@mysql.com
7ef7b9ad34 merge 2005-05-18 21:16:14 +03:00
monty@mysql.com
a9c4379c15 Fixed bug from last push 2005-05-18 21:12:59 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
c63ad3b549 New file default_modify.c. Fixed a typo on mysqld.cc 
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.
 2005-05-18 20:10:17 +03:00
konstantin@mysql.com
3b5897e5e9 Fix conflicting declaration and definition of db_output (compilation 
failure).
 2005-05-18 20:30:22 +04:00
monty@mysql.com
db40af2a6f Fix warnings from icc 
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
 2005-05-18 19:00:21 +03:00
ndbdev@dl145c.mysql.com
1513aad1e9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-17 20:07:03 +02:00
tulin@dl145c.mysql.com
23f79bd1f2 merge 2005-05-17 10:17:53 +02:00
konstantin@mysql.com
f1916b87d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-9643
 2005-05-16 18:29:04 +04:00
konstantin@mysql.com
38d68559bf A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work" 
- check on the client the unsupported feature and return 
an error message if it's been requested.
Additionally added API support for STMT_ATTR_PREFETCH_ROWS.
Post-review fixes.
 2005-05-16 18:27:21 +04:00
petr@mysql.com
834c47f336 Merge 2005-05-16 03:01:05 +04:00
petr@mysql.com
180d0ed620 post-review fixes 2005-05-16 01:54:02 +04:00
konstantin@mysql.com
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +04:00
georg@lmy002.wdf.sap.corp
41d284e608 added prototype for mysql_set_character_set function 2005-05-13 15:54:35 +02:00
monty@mishka.local
2d4a417330 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-13 13:36:02 +03:00
monty@mishka.local
2d25da2a4b concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
 2005-05-13 12:08:08 +03:00
mronstrom@mysql.com
c33a0673a6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into mysql.com:/Users/mikron/wl1682
 2005-05-12 12:01:01 +02:00
mronstrom@mysql.com
cf642995f6 Many fixes 2005-05-12 11:20:50 +02:00
konstantin@mysql.com
d0e24153b9 A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute" 
(crash on attempt to re-execute a statement with an open cursor) + 
post-review fixes.
 2005-05-12 11:16:12 +04:00
jimw@mysql.com
cde9f56b45 Merge 2005-05-09 11:28:57 -07:00
ramil@ram-book.(none)
8d30d30073 a fix (bug #10438: Raid stopped working because of change in atomic add detection). 2005-05-09 18:33:21 +05:00
msvensson@neptunus.(none)
939f18a676 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-09 11:31:27 +02:00
msvensson@neptunus.(none)
939b32f564 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-09 11:31:14 +02:00
msvensson@neptunus.(none)
ed39121c9a After review fixes 2005-05-09 11:30:20 +02:00
msvensson@neptunus.(none)
34cec09efb Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-09 11:26:48 +02:00
msvensson@neptunus.(none)
670eef8756 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-09 11:23:12 +02:00
ramil@mysql.com
def8eb631c Merge mysql.com:/home/ram/work/mysql-4.1 
into mysql.com:/home/ram/work/mysql-5.0
 2005-05-06 20:11:01 +05:00
ramil@mysql.com
db3abccfa2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/ram/work/4.1
 2005-05-06 18:41:42 +05:00
rburnett@bk-internal.mysql.com
ad6de2c05a Merge bk-internal.mysql.com:/users/rburnett/bug9721 
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
 2005-05-06 15:15:48 +02:00
rburnett@bk-internal.mysql.com
c95e33fadf Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/users/rburnett/bug9721
 2005-05-06 15:10:01 +02:00
ramil@ram-book.(none)
e1b6b7fe36 A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h). 2005-05-06 16:12:42 +05:00
ramil@mysql.com
788678d392 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 11:48:55 +05:00
bar@mysql.com
b93385de8f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 11:48:54 +05:00
ramil@mysql.com
802360fbc2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 08:34:50 +05:00
shuichi@mysql.com
2244ae8cef Added cp932 character set 2005-05-05 11:37:52 -07:00
bar@noter.(none)
153b928c10 Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci 
We cannot propagate constants with tricky collations.
 2005-05-05 21:13:57 +05:00
rburnett@bk-internal.mysql.com
e7d7c0f236 Bug #9721 net_write_timeout not used on Windows 
Added an extra parameter to all calls to timeout().  
1 means we want to set the write timeout
0 means we wnat to set the read timeout

viossl.c:
  Add which parameter to ssl timeout routine
vio_priv.h:
  Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
  Add which parameter to vio_timeout sigs
net_serv.cc:
  Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
  Set the appropriate timeout in vio_timeout
 2005-05-05 17:17:57 +02:00
holyfoot@mysql.com
556504287b Merge 2005-05-05 20:10:50 +05:00
holyfoot@hf-ibm.(none)
2c8e9df232 A lot of fixes to Precision math 
Mostly about precision/decimals of the results of the operations
 2005-05-05 20:06:49 +05:00
ram@ram-book.(none)
65f5a15a2d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ram-book.(none):/home/ram/work/5.0
 2005-05-05 19:22:33 +05:00
ramil@ram-book.(none)
b9ccbfd1f3 A fix (bug #10179: error in default value setting). 2005-05-05 17:17:55 +05:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
kent@mysql.com
c4acdc6e0f terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h: 
Initial Metrowerks CodeWarrior compiler support
 2005-05-05 09:15:14 +02:00
msvensson@neptunus.(none)
5b5565c30a BUG#10241 cygwin port: invalid pragma interface directives 
- Introduce ifdefs so we can control when to use #pragma interface on cygwin
 2005-05-04 15:05:56 +02:00
jimw@mysql.com
2d44d93ce6 Merge mysql.com:/home/jimw/my/mysql-5.0-5354 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-02 10:20:22 -07:00