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
37976 commits 2793 branches 343 tags 1.7 GiB
Commit graph

37976 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
05b14821ed Merge msvensson.mysql.internal:mysql/my50-m-bug16574 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:55:47 +02:00
unknown
507edfc279 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work


configure.in:
  Auto merged
 2006-09-15 16:53:21 +02:00
unknown
0fa2995def Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 16:52:52 +02:00
unknown
e15148ad79 Merge msvensson.mysql.internal:mysql/my50-m-bug16576 
into  shellback.(none):/home/msvensson/mysql/work/my50-work


configure.in:
  Auto merged
 2006-09-15 16:52:08 +02:00
unknown
8e76d8e868 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 16:51:30 +02:00
unknown
2d755a344e Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work


include/my_global.h:
  Auto merged
 2006-09-15 16:50:25 +02:00
unknown
860ae72264 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 16:50:08 +02:00
unknown
040c9378c1 Merge msvensson.mysql.internal:mysql/my50-m-bug21222 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:49:24 +02:00
unknown
018d0b9f64 Merge shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
tests/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged
 2006-09-15 16:46:57 +02:00
unknown
cb92ed6444 Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


tests/Makefile.am:
  Auto merged
 2006-09-15 16:42:27 +02:00
unknown
9ae1145d53 Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 
into  shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139


tests/Makefile.am:
  Auto merged
 2006-09-15 16:41:50 +02:00
unknown
1878b9f6f3 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
 2006-09-15 16:38:18 +02:00
unknown
7974ef2c5e Add SSL specific linker flags to --libmysqld-libs (Bug #21239) 2006-09-15 16:35:50 +02:00
unknown
fe966fca74 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 15:46:02 +02:00
unknown
581e2fd1c4 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 15:45:03 +02:00
unknown
1c0c90bdb3 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 15:43:46 +02:00
unknown
a55a105bc2 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 15:41:50 +02:00
unknown
6653bfb373 Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t 
extra/yassl/testsuite/test.hpp:
  Remove define for __MACH__
  http://bugs.debian.org/387369
 2006-09-15 15:41:04 +02:00
unknown
3e3d97ea14 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-15 09:00:46 -04:00
unknown
9d65cd5b11 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 14:39:55 +02:00
unknown
f3c2cc137c Merge msvensson.mysql.internal:mysql/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 14:36:03 +02:00
unknown
0dae68973c Merge msvensson.mysql.internal:mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 14:34:50 +02:00
unknown
0deefdd3a7 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


vio/viosocket.c:
  Auto merged
 2006-09-15 14:31:25 +02:00
unknown
cdc2c4e930 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work


sql/mysqld.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
 2006-09-15 14:28:25 +02:00
unknown
3860571e95 Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown 2006-09-15 14:27:45 +02:00
unknown
c97cc11392 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
sql/item.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-09-15 14:14:38 +02:00
unknown
e4b044060c Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.h:
  SCCS merged
 2006-09-15 11:52:49 +02:00
unknown
8fd0cf5498 Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2006-09-15 11:47:23 +02:00
unknown
341cc55ab6 Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-4.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-09-15 11:43:28 +02:00
unknown
7d131bcde2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
 2006-09-15 14:15:09 +05:00
unknown
39d888ccd1 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 11:03:55 +02:00
unknown
bba4e89a51 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
unknown
549c922bdb Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  siva.hindu.god:/usr/home/tim/m/bk/51


sql/sql_parse.cc:
  Auto merged
 2006-09-14 18:57:36 -06:00
unknown
38d2f59512 Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint 
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca
 2006-09-15 04:32:58 +04:00
unknown
8c3b5d22dd 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


client/mysql_upgrade.c:
  Auto merged
 2006-09-15 04:14:46 +04:00
unknown
ef218ff99d 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 
client/mysql_upgrade.c:
  The "password" option should be issued after group header to upgrade_defaults file whenever it is used
 2006-09-15 04:01:47 +04:00
unknown
2e5837355b Fix an assert on AIX 5.2, 64bit. COND_queue_state wasn't 
initialized prior to usage as well as deinitialized on shutdown.


sql/event_queue.cc:
  Deinitialize and initialize COND_queue_state
 2006-09-14 23:25:59 +02:00
unknown
38a9dea4ae Post-merge fix: remove dup() call in ha_archive.cc which resulted in a memory leak. 
storage/archive/ha_archive.cc:
  Remove dup() call from azdopen(&archive, create_file, ...), as it resulted in a memory leak.
 2006-09-14 14:59:14 -06:00
unknown
3f190bed63 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-14 16:37:22 -04:00
unknown
f1e6d23944 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge


BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-09-14 23:53:35 +04:00
unknown
2bc96e39fc Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my51-bug21424


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
 2006-09-14 14:57:11 -04:00
unknown
0aa344f3f3 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.


client/mysqldump.c:
  When the flush-privileges command line option is specified, make sure to FLUSH PRIVILEGES after only the mysql database's tables' data is restored so that grant tables are current.
mysql-test/r/mysqldump.result:
  Added Results.
mysql-test/t/mysqldump.test:
  Expanded existing test case for bug 21527 to also test for bug 21424. 
  Exercises new --flush-priviliges command line option.
  Test ignores log tables.
 2006-09-14 14:56:14 -04:00
unknown
ed59c0ffc8 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-14 11:05:27 -04:00
unknown
a68534973e 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
unknown
d3907c926c Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my51-bksendmailfix


BitKeeper/triggers/post-commit:
  SCCS merged
 2006-09-14 11:00:38 -04:00
unknown
2c79eff8d3 /usr/sbin not always in PATH environment variable. 
BitKeeper/triggers/post-commit:
  Attempt to default to /usr/sbin/sendmail if it exists, otherwise use sendmail.
 2006-09-14 10:57:00 -04:00
unknown
76c48d4368 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  moonbone.local:/work/21677-bug-4.1-opt-mysql
 2006-09-14 18:46:44 +04:00
unknown
cca7be1c95 type_date.test, type_date.result: 
Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN


mysql-test/t/type_date.test:
  Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
mysql-test/r/type_date.result:
  Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
 2006-09-14 18:45:23 +04:00
unknown
f770b69707 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
unknown
81899a0ce5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my51-bug21618


client/mysql.cc:
  Manual merge.
mysql-test/r/mysql.result:
  Manual merge.
mysql-test/t/mysql.test:
  Manual merge.
 2006-09-14 09:56:06 -04:00