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

64 commits

Author SHA1 Message Date
svoj@june.mysql.com
05a8c545df Merge mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-5.1-engines
 2007-04-18 16:35:22 +05:00
serg@janus.mylan
68fd66e853 wl#3700 - post-review fixes: 
s/ulonglong/key_part_map/, comments
 2007-03-17 00:13:25 +01:00
serg@janus.mylan
f813272125 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-03-16 14:09:30 +01:00
serg@janus.mylan
6aa5c001c5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-03-06 13:44:57 +01:00
istruewing@chilla.local
c72914329c Merge chilla.local:/home/mydev/mysql-5.0-bug26464 
into  chilla.local:/home/mydev/mysql-5.1-bug26464
 2007-03-06 12:35:58 +01:00
monty@mysql.com/narttu.mysql.fi
cfef5d04b3 Remove compiler warnings 2007-02-27 19:31:49 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
6163508f85 Fixes for compiler warnings. 2007-02-27 11:27:04 +02:00
serg@janus.mylan
689eed7406 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-02-21 11:36:23 +01:00
svoj@june.mysql.com
4a6770e06e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-02-05 15:31:20 +04:00
svoj@june.mysql.com
b6f39522de Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.1-engines
 2007-01-31 18:57:54 +04:00
serg@janus.mylan
a07fd5fa8f WL#3700: Handler API change: all index search methods - that is, 
index_read(), index_read_idx(), index_read_last(), and
records_in_range() - instead of 'uint keylen' argument take
'ulonglong keypart_map', a bitmap showing which keyparts are
present in the key value.
Fallback method is provided for handlers that are lagging behind.
 2007-01-29 10:40:26 +01:00
monty@mysql.com/narttu.mysql.fi
410fc81a72 After merge fixes 
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
 2007-01-29 01:47:35 +02:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
 2007-01-27 03:46:45 +02:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files: 
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
 2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +01:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
monty@narttu.mysql.fi
693b906f6e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 23:27:16 +02:00
monty@narttu.mysql.fi
430d215c58 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 22:38:12 +02:00
baker@bk-internal.mysql.com
f175a892ab Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-28 22:22:52 +01:00
monty@mysql.com/nosik.monty.fi
0e149b7170 Removed compiler warnings 
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
 2006-11-27 18:16:08 +02:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-22 14:11:36 +02:00
brian@zim.(none)
39458a6e1b This straightens up usage of have_ variables, and removes dead -skip-isam option. 2006-11-20 14:04:07 -08:00
joerg@trift2.
0d27df6f1a Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-01 13:26:03 +01:00
holyfoot/hf@mysql.com/deer.(none)
b8e31d05f1 bug #23369 (Embedded library can't be linked) 
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server
 2006-10-18 17:03:37 +05:00
stewart@willster.(none)
71636edc16 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
 2006-10-18 18:51:39 +10:00
svoj@april.(none)
cab855cac1 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
 2006-10-08 22:35:27 +05:00
svoj@may.pils.ru
0ea6959d78 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines
 2006-10-08 15:32:00 +05:00
svoj@april.(none)
1b5c111cf8 Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.1-engines
 2006-10-06 15:31:11 +05:00
brian@zim.(none)
faff46eefe Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 2006-10-05 00:41:29 -07:00
msvensson@neptunus.(none)
ca21b57992 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 09:28:44 +02:00
svoj@april.(none)
115c4fe8dc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-10-02 15:11:08 +05:00
brian@zim.(none)
46ae2113ba This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). 
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
 2006-09-30 12:49:46 -07:00
brian@zim.(none)
a756fd36ef This removes the passing of global hton to engine instance. 2006-09-29 17:19:02 -07:00
tsmith/tim@siva.hindu.god
ca1f99bdb8 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
 2006-09-29 17:01:16 -06:00
svoj@april.(none)
7ed413d17b Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.1-engines
 2006-09-29 00:23:43 +05:00
svoj@april.(none)
9353e3cf73 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-27 18:58:23 +05:00
brian@zim.(none)
f9a02811da Removed Field (this came in as an idea from a previous patch by Serg) 2006-09-26 21:26:04 -07:00
msvensson@shellback.(none)
fe0cfacf35 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-21 20:31:35 +02:00
istruewing@chilla.local
0aaf483734 Merge chilla.local:/home/mydev/mysql-5.1--main 
into  chilla.local:/home/mydev/mysql-5.1-tomain
 2006-09-21 09:37:31 +02:00
Kristofer.Pettersson@naruto.
3599c87654 Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maint 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-09-20 12:21:49 +02:00
Kristofer.Pettersson@naruto.
1db3f60248 Merge naruto.:C:/cpp/bug20789/my50-bug20789 
into  naruto.:C:/cpp/bug20789/my51-bug20789
 2006-09-20 07:40:56 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
98a8537adf Bug#22417 
"plug.in not included in dist source"
 2006-09-18 19:31:08 -07:00
acurtis/antony@ltamd64.xiphis.org
424857e0e4 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/engines-merge
 2006-09-18 12:16:03 -07:00
brian@zim.(none)
7194b6d75a This changes the order of the universe, black is now the new white. 
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database.
 2006-09-15 10:28:00 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
38a59efbc9 add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
b68f0437e7 fix for windows build 2006-08-24 22:10:55 -07:00
brian@zim.(none)
f68ce0ddef This changeset moves the ha_myisam files to their storage directories. It also includes updates for all engines include patch for windows builds. 2006-08-19 17:38:42 -07:00
brian@zim.(none)
800e348740 Update to push all of merge into the merge storage directory. 2006-08-19 10:23:22 -07:00
brian@zim.(none)
3d09079e31 Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed. 2006-08-18 21:19:19 -07:00
monty@mysql.com
c46fb742b8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-06-04 21:05:22 +03:00