mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41685 commits 2778 branches 343 tags 1.6 GiB
Commit graph

1113 commits

Author SHA1 Message Date
dean@mysql.com
ace1d892f0 Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0 
into mysql.com:/home/dellis/bkl/bug-4.1
 2005-02-15 17:30:40 -06:00
dean@mysql.com
c962d060ac ft_nlq_search.c: 
Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)
 2005-02-15 17:27:23 -06:00
monty@mysql.com
38d1a42481 Merge with 4.1 2005-02-15 17:12:13 +02:00
svoj@mysql.com
643b602832 Bug#8351 
Fix for crash when using a double quote in boolean fulltext query.
 2005-02-14 18:54:12 +04:00
serg@serg.mylan
3e708a27b1 Merge 2005-02-09 15:16:47 +01:00
serg@serg.mylan
184410c475 gone: 
merged
  auto-union
 2005-02-09 15:16:14 +01:00
mskold@bk-internal.mysql.com
14e3d36ad4 Removed old files 2005-02-09 14:35:50 +01:00
serg@serg.mylan
78cf24fb8c clean up gone 2005-02-09 14:05:01 +01:00
msvensson@neptunus.homeip.net
c9d7cd043b Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0 
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
 2005-02-04 15:13:45 +01:00
ramil@mysql.com
0d7228fff2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1
 2005-02-04 15:53:14 +04:00
ramil@mysql.com
f76ccd63cb type_float.result.es updated. 2005-02-04 15:35:08 +04:00
ramil@mysql.com
611e0e3e82 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/usr/home/ram/work/4.0
 2005-02-04 13:59:13 +04:00
ramil@mysql.com
e8ed450e15 type_float.result.es updated 2005-02-04 13:51:37 +04:00
mikael@orca.ndb.mysql.com
3b535f6072 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into orca.ndb.mysql.com:/export/home/mikael/mysql-5.0
 2005-02-03 21:16:05 +01:00
mikael@orca.ndb.mysql.com
0bb030a145 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into orca.ndb.mysql.com:/export/home/mikael/mysql-4.1
 2005-02-03 21:13:28 +01:00
msvensson@neptunus.homeip.net
3181f5d2b6 Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
brian@zim.(none)
630e020d3e Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into zim.(none):/home/brian/mysql/mysql-4.1
 2005-01-31 11:03:57 -08:00
tulin@mysql.com
bc317a19ce BUG#8208 don't fsync unless something has been written 
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1
 2005-01-31 11:47:10 +01:00
brian@zim.(none)
b484e29231 Cleanup for lost file descriptors on close table for ha_archive. 2005-01-28 16:43:10 -08:00
tulin@mysql.com
0c81869537 ndb_opt_defaults.h: 
removed usage of SIGRTMIN temorarilly as it causes problems on some platforms
 2005-01-28 19:28:14 +01: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
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
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02: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
kaa@polly.local
c46f527454 Fixed memory leak in handle_local_infile() 2005-01-17 19:21:01 +03:00
reggie@bob.(none)
68c540f090 Bug #7922 prompt \p fails on Windows for shared-memory connections 
Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory
 2005-01-15 23:19:34 -06:00
msvensson@neptunus.homeip.net
cb7524e103 Merge problem 
FC3 fix
 2005-01-14 14:33:26 +01:00
vtkachenko@mail.mysql.com
306df48731 Merge 2005-01-12 21:03:06 +01:00
vtkachenko@mail.mysql.com
9f640bbad9 logging_ok: 
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
 2005-01-12 20:55:06 +01:00
lenz@mysql.com
442a3a98b0 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-5.0-build
 2005-01-10 16:32:03 +01:00
lenz@mysql.com
af7dcec56d - removed the mysql-test/suites/jp test suite and marked all files as gone 2005-01-10 16:19:01 +01:00
joreland@mysql.com
f3baf38dbc merge 2005-01-07 06:47:41 +01:00
brian@zim.(none)
75f282df27 Fix for compiling error in sql_parse 2005-01-06 16:31:18 -08:00
joreland@mysql.com
c39db2febf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-05 21:22:38 +01:00
tulin@build.mysql.com
cee870e9b5 Merge bk-internal:/home/bk/mysql-4.1 
into build.mysql.com:/users/tulin/mysql-4.1-cluster-extra
 2005-01-05 15:55:26 +01:00
jonas@mysql.com
6f9e9b55da ndb - getTable retry if DICT busy 2005-01-05 13:37:34 +01:00
joreland@mysql.com
c62ed85054 Merge 2005-01-04 19:12:01 +01:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
mskold@mysql.com
9647a076a6 Merge 2005-01-03 14:33:00 +01:00
mskold@mysql.com
689748b548 Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2005-01-03 09:46:59 +01:00
paul@snake-hub.snake.net
fc0d550bad set_var.cc: 
Silence compiler warning.
 2005-01-02 15:10:08 -06:00
joreland@mysql.com
7f6fb4d9de Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2004-12-31 10:07:49 +01:00
joreland@mysql.com
7b7113a9bf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2004-12-31 09:51:57 +01:00
vtkachenko@intelp4d.mysql.com
ae1b969c8f Merge bk-internal:/home/bk/mysql-5.0 
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
 2004-12-31 09:00:34 +01:00
joreland@mysql.com
8f2d0ec1a1 merge 2004-12-31 06:36:32 +01:00
joreland@mysql.com
dd32940b50 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2004-12-31 06:14:18 +01:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00
mskold@mysql.com
76b2df6043 Merged bugfix 2004-12-30 21:36:16 +01:00
marty@linux.site
1ddb554b8b Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2004-12-30 19:56:09 +01:00
georg@beethoven.site
448d453ac1 Merge from 4.1: fix for bug #7285 (embedded server) 2004-12-30 17:17:21 +01:00