mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37836 commits 2857 branches 349 tags 1.6 GiB
Commit graph

37836 commits

Author SHA1 Message Date
brian@zim.(none)
f79ddec1f2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-15 10:48:30 -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
ramil/ram@myoffice.izhnet.ru
8445f3e3de Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
 2006-09-15 14:15:09 +05:00
dlenev@mockturtle.local
1022179878 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-15 09:19:35 +04:00
tsmith/tim@siva.hindu.god
ee6275c503 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-09-14 18:57:36 -06:00
ted@ted.mysql.internal
a1e9531d29 Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca 
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
 2006-09-15 04:14:46 +04:00
ted@ted.mysql.internal
cb08c534a0 Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option 2006-09-15 04:01:47 +04:00
andrey@example.com
fcb79e1bfd Fix an assert on AIX 5.2, 64bit. COND_queue_state wasn't 
initialized prior to usage as well as deinitialized on shutdown.
 2006-09-14 23:25:59 +02:00
tsmith/tim@siva.hindu.god
2c67b7cecd Post-merge fix: remove dup() call in ha_archive.cc which resulted in a memory leak. 2006-09-14 14:59:14 -06:00
dlenev@mockturtle.local
5ba1b83c98 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-14 23:53:35 +04:00
iggy@rolltop.ignatz42.dyndns.org
453c5c5aa8 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my51-bug21424
 2006-09-14 14:57:11 -04:00
iggy@rolltop.ignatz42.dyndns.org
4fa6c8c776 Bug#21424 mysqldump failing to export/import views. 
Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored. 
Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.
 2006-09-14 14:56:14 -04:00
iggy@rolltop.ignatz42.dyndns.org
ebcacf915b Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my51-bksendmailfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-09-14 11:04:35 -04:00
iggy@rolltop.ignatz42.dyndns.org
d7c9784682 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my51-bksendmailfix
 2006-09-14 11:00:38 -04:00
iggy@rolltop.ignatz42.dyndns.org
7c0c57d694 /usr/sbin not always in PATH environment variable. 2006-09-14 10:57:00 -04:00
cmiller@zippy.cornsilk.net
796452dbf5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-14 10:03:23 -04:00
cmiller@zippy.cornsilk.net
4cb1fdfb35 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my51-bug21618
 2006-09-14 09:56:06 -04:00
andrey@example.com
850ac2e898 Temporary fix for a deadlock. Needed so we can go with cloning 
5.1.12.
 2006-09-14 13:49:26 +02:00
brian@zim.(none)
24df00f232 Merge brian@dib.tangent.org:/export/home/brian/mysql/gnu-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-13 22:09:05 -07:00
brian@dib.
5371798e82 This fixes support for building mysql on Solaris with GNU tools. 2006-09-13 22:09:04 -07:00
tsmith/tim@siva.hindu.god
774e2bd2e6 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/51-mrg50
 2006-09-13 15:41:15 -06:00
tsmith/tim@siva.hindu.god
52c01e88d4 Post-merge fixes: 
- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc
 2006-09-13 15:37:35 -06:00
iggy@rolltop.ignatz42.dyndns.org
f25084805d Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-09-13 14:18:05 -04:00
iggy@rolltop.ignatz42.dyndns.org
eb641f4a43 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
 2006-09-13 14:16:53 -04:00
iggy@rolltop.ignatz42.dyndns.org
1cae186141 These bitKeeper changes will allow Windows to be used as a primary development platform. 2006-09-13 14:15:22 -04:00
kaa@polly.local
46f2a4dbc6 Fixed the faulty merge 2006-09-13 21:25:33 +04:00
kaa@polly.local
8bccf49ec5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-13 20:33:54 +04:00
cmiller@zippy.cornsilk.net
94382c313a Bug : NULL shown as empty string in client 
The column's NOT NULL flag doesn't affect what we should print.  Remove the
wrong logic that does check it.

Also, verify that this and the previous two tests print the same data as 
other output formats.
 2006-09-13 11:41:41 -04:00
ahristov@bk-internal.mysql.com
895a4442de event_queue.cc: 
fix sigsegv
 2006-09-13 16:55:15 +02:00
cmiller@zippy.cornsilk.net
1b23488cab Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-13 09:41:07 -04:00
cmiller@zippy.cornsilk.net
8a5f986c5a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0--windows-vio-uninit 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-13 09:40:07 -04:00
cmiller@maint1.mysql.com
0c72338bb4 Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint
 2006-09-13 15:13:52 +02:00
cmiller@maint1.mysql.com
54d1a8ef4d Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my50-bug15583 
into  maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583
 2006-09-13 15:01:19 +02:00
timour/timka@lamia.home
fad645f23e Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm 
into  lamia.home:/home/timka/mysql/src/5.1-dbg
 2006-09-13 15:22:50 +03:00
kaa@polly.local
654c03fb4c Merge polly.local:/tmp/20924/bug20294/my51-bug20294 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-13 16:09:29 +04:00
kaa@polly.local
61e3f8eae1 Merge polly.local:/tmp/20924/bug20294/my50-bug20294 
into  polly.local:/tmp/20924/bug20294/my51-bug20294
 2006-09-13 16:00:15 +04:00
kaa@polly.local
e812ae873d Merge polly.local:/tmp/20924/bug20294/my41-bug20294 
into  polly.local:/tmp/20924/bug20294/my50-bug20294
 2006-09-13 15:18:14 +04:00
kaa@polly.local
397f0df9ad Cset exclude: kaa@polly.local|ChangeSet|20060912122540|09861 
Cset exclude: kaa@polly.local|ChangeSet|20060908100829|09983
 2006-09-13 14:41:28 +04:00
tsmith@maint2.mysql.com
6a31ec2cad Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
 2006-09-13 09:03:52 +02:00
kaa@polly.local
3c6a9040d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-12 23:18:30 +04:00
tsmith@maint2.mysql.com
a1c4a48b7e Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg/g51 
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51
 2006-09-12 19:40:00 +02:00
andrey@example.com
2ef67ec2e5 ws fix 2006-09-12 17:48:26 +02:00
timour/timka@lamia.home
38a450b44a Fix for BUG#21774: Column count doesn't match value count at row x 
The cause of the bug was an incomplete fix for bug 18080.
The problem was that setup_tables() unconditionally reset the
name resolution context to its 'tables' argument, which pointed
to the first table of an SQL statement.

The bug fix limits resetting of the name resolution context in
setup_tables() only in the cases when the context was not set
by earlier parser/optimizer phases.
 2006-09-12 17:50:24 +03:00
msvensson@neptunus.(none)
7b7e66763c Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work 2006-09-12 16:43:57 +02:00
kaa@polly.local
ca48b7af0c Merge polly.local:/tmp/20924/bug20294/my50-bug20294 
into  polly.local:/tmp/20924/bug20294/my51-bug20294
 2006-09-12 18:43:38 +04:00
kaa@polly.local
13331b8d24 Fixed compilation 2006-09-12 18:28:36 +04:00
msvensson@neptunus.(none)
f6ce081f6a Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 16:13:00 +02:00
kaa@polly.local
e03faff3e4 Merge polly.local:/tmp/20924/bug20294/my41-bug20294 
into  polly.local:/tmp/20924/bug20294/my50-bug20294
 2006-09-12 17:57:15 +04:00
msvensson@neptunus.(none)
5a6cee9e1c Merge neptunus.(none):/home/msvensson/mysql/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 15:38:02 +02:00
msvensson@neptunus.(none)
da9724c992 Merge neptunus.(none):/home/msvensson/mysql/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 15:34:55 +02:00