mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33206 commits 2774 branches 343 tags 1.6 GiB
Commit graph

15630 commits

Author SHA1 Message Date
unknown
1032be522b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge


sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
 2006-04-21 21:04:43 -04:00
unknown
826aa19dc6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
 2006-04-21 16:26:34 -04:00
unknown
e0f275ecb4 After merge fixes. 2006-04-21 14:21:17 -04:00
unknown
46da233ad0 Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge


sql/sql_repl.cc:
  Auto merged
sql/ha_innodb.cc:
  Manual merge 5.0 -> 5.1
sql/ha_innodb.h:
  Manual merge 5.0 -> 5.1
sql/handler.cc:
  Manual merge 5.0 -> 5.1
sql/handler.h:
  Manual merge 5.0 -> 5.1
sql/mysqld.cc:
  Manual merge 5.0 -> 5.1
sql/set_var.cc:
  Manual merge 5.0 -> 5.1
sql/sql_class.h:
  Manual merge 5.0 -> 5.1
 2006-04-21 13:20:15 -04:00
unknown
78907f3488 ndb: minor modification in replication timer code 
added missing setting of latest applied epoch
 2006-04-21 18:28:00 +02:00
unknown
cff7ab3234 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 16:42:31 +02:00
unknown
572b3cbb72 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/partition_info.h:
  Auto merged
 2006-04-21 09:30:05 -04:00
unknown
3d7999d0bf Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
 2006-04-21 08:57:53 -04:00
unknown
37bc39c8f8 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
 2006-04-21 08:55:01 -04:00
unknown
2cb17f9691 BUG#18962: Crash of ALTER TABLE .. DROP PARTITION ... 
Review fixes


sql/partition_info.cc:
  Review fixes
sql/partition_info.h:
  Review fixes
 2006-04-21 08:37:09 -04:00
unknown
b71afda5f7 WL 2826: Error handling of ALTER TABLE for partitioning 
Final review fixes


sql/mysql_priv.h:
  Final review fixes
sql/sql_table.cc:
  Final review fixes
 2006-04-21 08:35:25 -04:00
unknown
f5c2191c71 ndb: corrected install dir 
ndb: corrected initialization of records


mysql-test/Makefile.am:
  ndb: corrected install dir
sql/ha_ndbcluster.cc:
  ndb: corrected initialization of records
 2006-04-21 13:51:58 +02:00
unknown
628e0eb305 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 11:32:25 +02:00
unknown
17e3ee3553 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2


mysql-test/r/index_merge_innodb.result:
  Auto merged
sql/opt_range.cc:
  Auto merged
 2006-04-20 17:00:29 -07:00
unknown
8206128210 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-20 16:14:17 -07:00
unknown
e66e612931 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962


mysql-test/r/partition_pruning.result:
  Auto merged
sql/partition_info.cc:
  Auto merged
 2006-04-20 14:16:27 -04:00
unknown
f9c7528ab9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-04-20 20:49:41 +04:00
unknown
cfe3397e38 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-20 07:24:34 -07:00
unknown
6f5cf392ff Bug #19214 running mysqld without binlog causes 10s timeout to drigger on schema ops 
- binlog thread should not wait for apply status share if binlog is not enabled
 2006-04-20 14:44:16 +02:00
unknown
a008bb512d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-20 11:11:21 +02:00
unknown
d9347545b2 WL 2826: Error handling of ALTER TABLE for partitioning 
Fixed up create_handler_files call


sql/ha_ndbcluster.cc:
  Fixed up create_handler_files call
sql/ha_partition.cc:
  Fixed up create_handler_files call
sql/handler.h:
  Fixed up create_handler_files call
sql/sql_table.cc:
  Fixed up create_handler_files call
sql/unireg.cc:
  Fixed up create_handler_files call
 2006-04-19 21:43:30 -04:00
unknown
73a66e27e6 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/my_sys.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
BUILD/SETUP.sh:
  manual merge
BUILD/compile-pentium-debug-max:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/ha_ndbcluster.h:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/ha_partition.h:
  manual merge
sql/handler.h:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
sql/unireg.cc:
  manual merge
 2006-04-19 21:22:35 -04:00
unknown
eabd990341 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-20 03:20:03 +02:00
unknown
c8171434ae ndb uncomitted row count cont'd, applying new fix since last one was no good 2006-04-20 03:05:50 +02:00
unknown
66e73768cf WL2826: Error handling of ALTER TABLE for partitioning 
Actual error reported in my_errno from my_delete


sql/sql_table.cc:
  Actual error reported in my_errno from my_delete
 2006-04-19 20:57:42 -04:00
unknown
319c5da152 WL 2826: Error handling of ALTER TABLE for partitioning 
Various bug fixes (mostly mixed to and from in replace methods)


sql/sql_partition.cc:
  Various bug fixes (mostly mixed to and from in replace methods)
sql/sql_table.cc:
  Various bug fixes (mostly mixed to and from in replace methods)
 2006-04-19 20:04:00 -04:00
unknown
9a1a9ecc00 small correction in thd_ndb hash_init 2006-04-19 23:49:51 +02:00
unknown
5816a7cb25 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-wl2826 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/sql_table.cc:
  Auto merged
 2006-04-19 16:19:21 -04:00
unknown
271cf5ed5c Merge mysql.com:/home/jimw/my/mysql-5.1-old-scripts 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-19 13:11:58 -07:00
unknown
c0d1c190f8 WL 2826: Error handling of ALTER TABLE for partitioning 
Fixed a number of bugs


sql/sql_table.cc:
  Fixed a number of bugs
 2006-04-19 16:08:59 -04:00
unknown
47ba0146ec corrected wrong usage of hash 2006-04-19 21:30:22 +02:00
unknown
213a6d1031 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
 2006-04-19 19:56:52 +02:00
unknown
8fda6848e7 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-19 10:45:06 -07:00
unknown
222cd6e891 Merge mysql.com:/opt/local/work/tmp_merge 
into  mysql.com:/opt/local/work/mysql-5.1-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/set_var.cc:
  Manual merge.
sql/set_var.h:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.
 2006-04-19 21:12:24 +04:00
unknown
8f2c82b383 removed use of local data in local cache in preparation for removing local cache usage all together 2006-04-19 18:29:25 +02:00
unknown
662ca8fd3b Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-wl2826 
into  c-2709e253.1238-1-64736c10.cust.bredbandsbolaget.se:/Users/mikron/wl2826
 2006-04-19 18:05:45 +02:00
unknown
c1b8cff03f WL 2826: Error handling of ALTER TABLE for partitioning 
Moved error inject from being flags to compiler to being part of config.h
Also error inject only defined if debug is also defined
+Small fixes


configure.in:
  Moved error inject from being flags to compiler to being part of config.h
  Also error inject only defined if debug is also defined
sql/handler.h:
  Small fixes
 2006-04-19 12:05:44 -04:00
unknown
db37c0d615 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-19 14:58:42 +02:00
unknown
37fdc23672 BUG#18094 Slave caches invalid table definition after atlters causes select failure 
- return correct object status from ndb dictionary
- check for validity of index retrieved from index, and retry if invalid
 2006-04-19 14:54:39 +02:00
unknown
1fa3cdd006 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new


mysql-test/t/disabled.def:
  Merge with mysql-5.1-new
 2006-04-19 10:58:44 +02:00
unknown
c83dce6e34 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
 2006-04-19 11:42:41 +05:00
unknown
ba67c865db item_xmlfunc.cc: 
After review minor fixes for bug#16319
  Thanks to Gluh for suggestions.


sql/item_xmlfunc.cc:
  After review minor fixes.
  Thanks Gluh for suggestions.
 2006-04-19 11:11:47 +05:00
unknown
2b49181d2f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1


include/my_sys.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysys/my_access.c:
  SCCS merged
 2006-04-19 09:50:17 +05:00
unknown
c6590081c3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-19 09:22:04 +05:00
unknown
4624982ecb WL 2826: Error handling of ALTER TABLE for partitioning 
Use \0 to indicate frm-file
Add more comments
Add more #ifdef code missing previously


sql/sql_partition.cc:
  Use \0 to indicate frm-file
sql/sql_table.cc:
  Use \0 to indicate frm-file
  Add more comments
  Add more #ifdef code missing previously
 2006-04-18 16:58:12 +02:00
unknown
afe484cba6 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
 2006-04-18 09:00:02 +02:00
unknown
c17b103ae7 Invalidate old table at rename 2006-04-18 08:57:37 +02:00
unknown
a3e60effe3 fix for Bug#18848 "SIGHUP crashes the server" (v2) 
sql/log.cc:
  check whether log tables were initialized, before trying to
  flush them during sighup processing. Then use logger THD
  for flush.
 2006-04-18 08:43:13 +04:00
unknown
2cf34e52a6 Delete unused (and unmaintained) scripts. 
BitKeeper/deleted/.del-watchdog_mysqld~279cf39e994b36e2:
  Delete: sql/watchdog_mysqld
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
  Delete: scripts/mysqld_safe-watch.sh
BitKeeper/deleted/.del-mysql_prepare_privilege_tables_for_5.sql~76ea3c82bdbbead4:
  Delete: scripts/mysql_prepare_privilege_tables_for_5.sql
 2006-04-17 20:01:07 -07:00
unknown
7b6c5a6b76 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
 2006-04-17 16:40:16 -07:00