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

33479 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
07268dfad0 Merge 
client/mysql.cc:
  Auto merged
 2006-04-21 20:04:13 +02:00
unknown
ea395eb0af Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-new-clean
 2006-04-21 20:49:54 +03: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
42f715818a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-04-21 09:46:47 -07:00
unknown
e9bf1b9a89 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-21 18:31:17 +02:00
unknown
377968d21e Delete some more NDB cruft. 
BitKeeper/deleted/.del-Linuxmkisofs~c3340108ee428bfd:
  Delete: storage/ndb/home/bin/Linuxmkisofs
BitKeeper/deleted/.del-Solarismkisofs~f2352aa3eb74bf81:
  Delete: storage/ndb/home/bin/Solarismkisofs
BitKeeper/deleted/.del-cvs2cl.pl~f6dd53614cca3bd7:
  Delete: storage/ndb/home/bin/cvs2cl.pl
BitKeeper/deleted/.del-fix-cvs-root~85b114dffe4dcd71:
  Delete: storage/ndb/home/bin/fix-cvs-root
BitKeeper/deleted/.del-import-from-bk.sh~fd7b3609d1cb93cc:
  Delete: storage/ndb/home/bin/import-from-bk.sh
BitKeeper/deleted/.del-ndb_deploy~1d70ed639d03fc07:
  Delete: storage/ndb/home/bin/ndb_deploy
BitKeeper/deleted/.del-funcs.sh~19e11fb1f65b19e1:
  Delete: storage/ndb/home/lib/funcs.sh
BitKeeper/deleted/.del-ndbdoxy.pl~cc153c886e5d1085:
  Delete: storage/ndb/home/bin/ndbdoxy.pl
BitKeeper/deleted/.del-ngcalc~9f8fb4a518060935:
  Delete: storage/ndb/home/bin/ngcalc
BitKeeper/deleted/.del-parseConfigFile.awk~17f70292f412959a:
  Delete: storage/ndb/home/bin/parseConfigFile.awk
BitKeeper/deleted/.del-setup-test.sh~57acbf006ee61516:
  Delete: storage/ndb/home/bin/setup-test.sh
BitKeeper/deleted/.del-signallog2html.sh~11f078f3616cece4:
  Delete: storage/ndb/home/bin/signallog2html.sh
BitKeeper/deleted/.del-signallog2list.awk~9e3c7272618f8a3e:
  Delete: storage/ndb/home/bin/signallog2html.lib/signallog2list.awk
BitKeeper/deleted/.del-stripcr~87d0d3d45e5dcf97:
  Delete: storage/ndb/home/bin/stripcr
BitKeeper/deleted/.del-uniq_blocks.awk~c98f28fca67bec81:
  Delete: storage/ndb/home/bin/signallog2html.lib/uniq_blocks.awk
 2006-04-21 09:30:16 -07:00
unknown
ab6a596c86 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 18:30:15 +02: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
e98e688340 disabled.def cleanup 
storage/ndb/test/ndbapi/bank/Bank.cpp:
  added skip create option to bank test program
 2006-04-21 17:28:45 +02:00
unknown
bb40065a1f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  rurik.mysql.com:/home/igor/mysql-4.1
 2006-04-21 08:22:03 -07:00
unknown
b93dd4327b Post merge fixes 2006-04-21 08:19:38 -07:00
unknown
10eac46a52 Bug#15728: LAST_INSERT_ID function inside a stored function returns 0 
Do not reset value of LAST_INSERT_ID() in sub-statement.


mysql-test/r/rpl_insert_id.result:
  Add result for bug#15728.
mysql-test/r/sp.result:
  Add result for bug#15728.
mysql-test/t/rpl_insert_id.test:
  Add test case for bug#15728.
mysql-test/t/sp.test:
  Add test case for bug#15728.
sql/sql_class.cc:
  Do not reset value of LAST_INSERT_ID() in sub-statement.
 2006-04-21 18:55:04 +04: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
b0a1ea4071 Merge jonas@perch:src/51-work/ 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
 2006-04-21 16:34:51 +02:00
unknown
d8b3299d9b added skip create option to bank test program 2006-04-21 16:05:42 +02:00
unknown
fbb5bfc1e4 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
 2006-04-21 15:57:52 +02:00
unknown
d030c104fa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-21 15:36:11 +02:00
unknown
c717637227 Bug #19255 ndb: restore of ndb backup from different endian does not work 
+ removed not needed --


mysql-test/mysql-test-run.pl:
  post merge fix
 2006-04-21 15:36:10 +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
1baaa86846 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2006-04-21 15:20:10 +02: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
9d1f1c32e1 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-21 14:55:02 +02: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
90ecf9b698 Post-push fix for BUG#18344: DROP DATABASE does not drop associated routines 
Fixed windows compile error in sql/sp.cc (missing cast to byte*)


sql/sp.cc:
  Fixed windows compile error. (missing cast to byte*)
 2006-04-21 14:30:44 +02:00
unknown
2e4d7bd8ba Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-21 14:28:35 +02:00
unknown
bff6df9232 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
 2006-04-21 14:15:54 +02:00
unknown
3cd43eb425 ndb - 
bug#19141, bug#18575
  
  Maek sure global dict lock is taken during create/drop file/filegroup


storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
  Fix error code
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix c_blockState lock for createdrop file/filegroup
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix not master for create/drop file
 2006-04-21 14:13:19 +02:00
unknown
b5cde201d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
 2006-04-21 14:02:21 +02:00
unknown
98c7825ad8 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/include/util/ndb_opts.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  manual merge
mysql-test/mysql-test-run.sh:
  manual merge
mysql-test/ndb/ndbcluster.sh:
  manual merge
 2006-04-21 14:00:44 +02:00
unknown
86b74da608 ndb - 
Fix error handling when out of diskspace


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix error handling when out of diskspace
 2006-04-21 13:58:55 +02:00
unknown
04be401f96 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18643
 2006-04-21 13:56:40 +02:00
unknown
0a22763fa6 Bug #17230 Can't change character-sets-dir for ndbd 2006-04-21 13:53:48 +02: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
afd9558e52 Don't run mysqld when started in ddd 
Maybe we should do the same for gdb?
 2006-04-21 12:30:33 +02:00
unknown
946adafdc2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-21 12:16:17 +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
58f67f39c3 Merge jonas@perch:src/51-work/ 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 11:29:34 +02:00
unknown
8e7d5f789a bug#18594 ndb_restore log boken in 5.1 
- corrected previous patch
- read log entry variables out into explicit variables for siimpler code (and backwards compatability code)
 2006-04-21 11:26:21 +02:00
unknown
761624e7f4 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug18344/mysql-5.0-runtime
 2006-04-21 10:22:06 +02:00
unknown
4e90495f3c Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
 2006-04-21 10:21:43 +02:00
unknown
8b35dc5738 Fix for bug#19088: NDBAPI: Segfault in NdbIndexScanOperation::setBound(...) 2006-04-21 10:17:55 +02:00
unknown
18b2515817 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/my50-bug19190
 2006-04-21 10:17:16 +02:00
unknown
925a9dcf4d added one more missing install path for new files 2006-04-21 09:43:21 +02:00
unknown
103fbcee45 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/order_by.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/func_gconcat.test:
  Manual merge
mysql-test/t/order_by.test:
  Manual merge
sql/sql_lex.h:
  Manual merge
sql/sql_parse.cc:
  Manual merge
sql/sql_union.cc:
  Manual merge
 2006-04-21 00:36:20 -07:00
unknown
4a90a6583b ndb - bug#19245 
A-insert/B-insert/A-rollback/B-rollback leads to node crash, as bits in tuple header gets incorrectly assigned in second insert
  this also likely fixes bug 18589 and explains 18808


storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  remove debug printout
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Make sure that alloc bit is set if insert and first_op
storage/ndb/test/ndbapi/testBasic.cpp:
  testcase for bug#19245
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase for bug#19245
 2006-04-21 09:09:33 +02:00
unknown
7aaeb9f97a added missing install paths for new files 2006-04-21 08:53:25 +02:00
unknown
301a24e3a0 Bug #17896: MIN of CASE WHEN returns non-minimum value! 
- after review fixes


sql/item_cmpfunc.cc:
  Bug #17896: MIN of CASE WHEN returns non-minimum value!
  - after review fixes.
 2006-04-21 11:48:00 +05:00
unknown
d4f4f5bdaf Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2006-04-20 22:34:37 -07:00