Commit graph

2157 commits

Author SHA1 Message Date
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