mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42495 commits 2793 branches 343 tags 1.7 GiB
Commit graph

19375 commits

Author SHA1 Message Date
mskold/marty@linux.site
bcc738396e Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-01-03 15:11:47 +01:00
mskold/marty@mysql.com/linux.site
8272333243 ndb_use_transactions is set from value for command line flag 2007-01-03 14:56:26 +01:00
istruewing@chilla.local
54c147a1bc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-01-03 10:27:51 +01:00
mskold/marty@mysql.com/linux.site
b448ad77c8 bug #25296 Truncate table converts NDB disk based tables to in-memory tables: ha_ndbcluster::update_create_infohas to check for explicit STORAGE MEMORY 2007-01-03 10:22:31 +01:00
mskold/marty@mysql.com/linux.site
a4e84daa7f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-01-03 10:04:47 +01:00
istruewing@chilla.local
d37ff7d7bc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-01-03 08:52:50 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
5b1b0a6ff4 Merge mysql.com:/d2/hf/common/my41-common 
into  mysql.com:/d2/hf/opt/my41-opt
 2007-01-03 11:17:00 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
79361c655a Merge mysql.com:/d2/hf/common/my50-common 
into  mysql.com:/d2/hf/opt/my50-opt
 2007-01-03 11:13:01 +04:00
malff/marcsql@weblab.(none)
4cae0119fd Bug#25302 (893 reduce/reduce conflicts in parser grammar) 
This fix corrects build issues introduced by WL#3031:

- In the SQL grammar, 'USER' is a SQL 2003 reserved keyword,
and therefore should not be part of the keyword production.

- In sql/sql_parse.cc, the code for CREATE SERVER and ALTER SERVER
was not using proper format strings in the DBUG_PRINT statements.
 2007-01-02 22:16:24 -07:00
mskold/marty@mysql.com/linux.site
500918f2ab bug #25296 Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info 2007-01-02 22:31:29 +01:00
malff/marcsql@weblab.(none)
0055056c91 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-merge
 2007-01-02 14:18:13 -07:00
cmiller@zippy.cornsilk.net
0c181b0786 Bug#23950: misplaced code in mysqld.cc, main() 
We should initialize before anything else.
 2007-01-02 12:56:48 -05:00
mskold/marty@linux.site
790fdad1be Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-01-02 15:58:04 +01:00
mskold/marty@linux.site
7b9387fc19 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-01-02 15:53:37 +01:00
mskold/marty@mysql.com/linux.site
866b02b934 Added --ndb-use-transactions 2007-01-02 15:47:58 +01:00
holyfoot/hf@hfmain.(none)
e6b3a71cc0 Merge mysql.com:/d2/hf/common/my50-common 
into  mysql.com:/d2/hf/common/my51-common
 2007-01-02 17:55:18 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
726a51bc77 Merge mysql.com:/d2/hf/common/my41-common 
into  mysql.com:/d2/hf/common/my50-common
 2007-01-02 17:50:55 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
998167acce embedded-server related fixes 2007-01-02 17:46:20 +04:00
mskold/marty@linux.site
474760fb32 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-01-02 12:45:04 +01:00
mskold/marty@mysql.com/linux.site
40ab7bdb8f bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: removed use of environment variable NDB_DEFAULT_DISK 2007-01-02 10:05:58 +01:00
kent@kent-amd64.(none)
7e94389684 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-01-01 09:55:35 +01:00
kent@mysql.com/kent-amd64.(none)
344599948d mysqld.cc, configure.in: 
Don't use thread priority by default on Mac OS X (bug#18526)
 2007-01-01 09:54:41 +01:00
holyfoot/hf@hfmain.(none)
b4c0867df1 Merge mysql.com:/d2/hf/clean/my51-clean 
into  mysql.com:/d2/hf/common/my51-common
 2006-12-31 12:41:42 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
874d366500 Merge mysql.com:/d2/hf/clean/my50-clean 
into  mysql.com:/d2/hf/common/my50-common
 2006-12-31 12:39:20 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0831699f5c Merge mysql.com:/d2/hf/clean/my41-clean 
into  mysql.com:/d2/hf/common/my41-common
 2006-12-31 12:37:42 +04: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)
895e442dbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:04:59 +01:00
kent@mysql.com/kent-amd64.(none)
1b8bd0d246 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.0
 2006-12-31 01:04:07 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s: 
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
 2006-12-31 01:02:27 +01:00
cmiller@calliope.local
0fa22f5a59 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
 2006-12-29 16:37:05 -05:00
cmiller@calliope.local.cmiller/calliope.local
ee120139ab Bug#23950: misplaced code in mysqld.cc, main() 
Moved MY_INIT() to top of main(), where it should be.
 2006-12-29 16:07:33 -05:00
svoj@june.mysql.com
9d106f7a10 Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.1-engines
 2006-12-29 17:33:34 +04:00
bar@mysql.com
8f3718848d After merge fix 2006-12-29 16:45:10 +04:00
bar@mysql.com
2c039cccb6 log_event.cc: 
After merge fix
 2006-12-29 16:42:16 +04:00
svoj@mysql.com/june.mysql.com
441f5069db Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
 2006-12-29 15:33:03 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
842b23a8fc WL#3630 (add embedded server to pushbuild) 
5.1-related fixes
libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that
keep dependance on THD structure.
Minor fixes to make tests working.
 2006-12-28 09:42:04 +04:00
istruewing@chilla.local
249f799d61 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-27 21:08:53 +01:00
istruewing@chilla.local
d63fa8434c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-27 21:07:31 +01:00
istruewing@chilla.local
3765d8a012 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-27 19:24:08 +01:00
svoj@mysql.com/april.(none)
fb01230ac5 After merge fix. 2006-12-27 19:54:49 +04:00
svoj@mysql.com/april.(none)
2fc0bca6a4 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
 2006-12-27 17:55:33 +04:00
tomas@poseidon.
7b9a5f6de2 ndb: remove compiler warnings 2006-12-27 14:16:34 +01:00
svoj@june.mysql.com
e0a433e1ce Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.1-engines
 2006-12-27 17:10:52 +04:00
svoj@mysql.com/june.mysql.com
c72d93b0ed Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines
 2006-12-27 15:50:45 +04:00
svoj@mysql.com/june.mysql.com
28b1bb363b Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines
 2006-12-27 15:35:26 +04:00
tomas@poseidon.
044c410968 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2006-12-27 11:01:54 +01:00
tsmith/tim@siva.hindu.god
682596d7ce Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-26 22:28:28 -07:00
kent@kent-amd64.(none)
2a10b99907 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-27 02:24:40 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files: 
Changed header to GPL version 2 only
 2006-12-27 02:23:51 +01:00