mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35029 commits 2778 branches 343 tags 1.6 GiB
Commit graph

16435 commits

Author SHA1 Message Date
unknown
a245f59723 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-16 21:39:09 +02:00
unknown
9224719d25 Fix for broken compile if not compiling with partitioning 2006-06-16 15:04:35 -04:00
unknown
6f1605321d remove wrong assert 2006-06-16 16:26:30 +02:00
unknown
0237d9b0af String::set(double) and set(longlong) -> set_real() and set_int() 
fix Field::store(double) being used instead of store(longlong)

NB: overloading functions is evil
 2006-06-16 12:17:20 +02:00
unknown
61f4440c29 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/valgrind.supp:
  Manual merge
 2006-06-16 18:54:20 +10:00
unknown
9b402b909b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 23:50:31 +02:00
unknown
6d16282f39 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
 2006-06-15 17:50:30 -04:00
unknown
1dd45d5c5f Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397


mysql-test/r/partition_error.result:
  Auto merged
mysql-test/t/partition_error.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2006-06-15 16:00:54 -04:00
unknown
6dd40f3e0a BUG#20397: Crash when alter table t1 engine = x; 
Review fixes


sql/sql_table.cc:
  Review fixes
 2006-06-15 15:56:47 -04:00
unknown
689205ae94 Fix for bug#19667 group by a decimal expression yields wrong result 
mysql-test/r/type_newdecimal.result:
  Fix for bug#19667 group by a decimal expression yields wrong result
   test case
mysql-test/t/type_newdecimal.test:
  Fix for bug#19667 group by a decimal expression yields wrong result
   test case
 2006-06-15 16:24:02 +05:00
unknown
0961714435 Merge mysql.com:/home/mydev/mysql-5.1--main 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-15 12:22:40 +02:00
unknown
b15981a40c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 12:21:34 +02:00
unknown
d7d401ffa4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 11:59:50 +02:00
unknown
ed849efcc1 Fixed typo in variable name 2006-06-15 11:59:21 +02:00
unknown
6bc9973183 Merge mysql.com:/home/mydev/mysql-5.0-amerge 
into  mysql.com:/home/mydev/mysql-5.1-amerge


mysql-test/r/lock_multi.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Manual merge
sql/ha_myisammrg.h:
  Manual merge
 2006-06-15 10:58:02 +02:00
unknown
6cd2be25cb Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 08:27:50 +02:00
unknown
e8288ff926 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  Manual merge
mysql-test/r/func_time.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge
 2006-06-14 20:00:36 -07:00
unknown
c56442382b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 04:37:21 +02:00
unknown
1b3ffa03f2 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  xiphis.org:/home/antony/work2/p2-bug20168.4
 2006-06-14 19:37:21 -07:00
unknown
ed0035a686 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002


sql/ha_ndbcluster.cc:
  Auto merged
 2006-06-14 22:32:41 -04:00
unknown
9467e2615c Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2006-06-14 19:41:33 -04:00
unknown
4414b56d85 merge update 
mysql-test/t/partition.test:
  merge error
 2006-06-14 19:40:06 -04:00
unknown
7c1748a1a4 cleanup String::set(integer) 2006-06-14 23:09:03 +02:00
unknown
0cbb74216f Merge xiphis.org:/home/antony/work2/p2-bug20168.2 
into  xiphis.org:/home/antony/work2/p2-bug20168.4


mysql-test/r/lock_multi.result:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
mysql-test/t/lock_multi.test:
  SCCS merged
 2006-06-14 13:12:19 -07:00
unknown
23e20da872 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
 2006-06-14 22:12:18 +02:00
unknown
79430bac1b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  manual merge
 2006-06-14 20:38:52 +02:00
unknown
013d0ccfaa Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


sql/ha_ndbcluster.cc:
  Auto merged
 2006-06-14 20:27:32 +02:00
unknown
39246e2fa7 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  manual merge
 2006-06-14 20:25:51 +02:00
unknown
f3a286cc54 Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL 
- correction of backport error
 2006-06-14 20:22:03 +02:00
unknown
ca1fd91f16 Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL 
- make sure to disable bulk insert when check for duplicate key is needed


mysql-test/r/ndb_loaddatalocal.result:
  New BitKeeper file ``mysql-test/r/ndb_loaddatalocal.result''
mysql-test/t/ndb_loaddatalocal.test:
  New BitKeeper file ``mysql-test/t/ndb_loaddatalocal.test''
 2006-06-14 20:16:32 +02:00
unknown
98b03424ae Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-14 19:46:52 +02:00
unknown
7d119734ce Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/partition_info.cc:
  manual merge
sql/sql_partition.cc:
  manual merge
 2006-06-14 09:22:27 -04:00
unknown
e6170de4c0 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_partition.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/r/partition_error.result:
  manual merge
mysql-test/r/partition_range.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
mysql-test/t/partition_error.test:
  manual merge
mysql-test/t/partition_range.test:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/partition_element.h:
  manual merge
sql/partition_info.cc:
  manual merge
sql/partition_info.h:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_partition.cc:
  manual merge
sql/sql_table.cc:
  manual merge
sql/table.cc:
  manual merge
 2006-06-14 09:12:07 -04:00
unknown
179c979937 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/partition_info.cc:
  manual merge
 2006-06-14 08:51:39 -04:00
unknown
a4c2d33ed9 BUG#19801: Problems with single partition with only NULL allowed in LIST partitioning 
After review fix


sql/partition_info.cc:
  After review fix
 2006-06-14 08:35:19 -04:00
unknown
6e9bdcc9e9 BUG#16002: Unsigned partition function support 
After review fix


sql/sql_partition.cc:
  After review fix
 2006-06-14 08:31:38 -04:00
unknown
5436a16e43 Fixed variable description 2006-06-14 14:13:45 +02:00
unknown
b20b17d604 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-14 13:57:17 +02:00
unknown
ed6bd84fee Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1


sql/sql_table.cc:
  Auto merged
 2006-06-14 13:45:30 +02:00
unknown
708740c8bb After merge fix. 2006-06-14 16:45:29 +05:00
unknown
9df1f38597 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1


sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
 2006-06-14 13:45:27 +02:00
unknown
de253b6359 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-14 13:45:26 +02:00
unknown
dcd5786c16 corrected merge error 2006-06-14 13:32:29 +02:00
unknown
8b4362b63a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


sql/ha_ndbcluster.cc:
  Auto merged
 2006-06-14 13:01:32 +02:00
unknown
ec3a7c41b7 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  manual merge
 2006-06-14 13:00:15 +02:00
unknown
234de47475 Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to 
corrupt
  - add infinite retry on drop table temporary error
 2006-06-14 12:54:28 +02:00
unknown
2bd4fb4669 Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to corrupt 
- add infinite retry on drop table temporary error


mysql-test/r/ndb_restore_partition.result:
  New BitKeeper file ``mysql-test/r/ndb_restore_partition.result''
mysql-test/t/ndb_restore_partition-master.opt:
  New BitKeeper file ``mysql-test/t/ndb_restore_partition-master.opt''
mysql-test/t/ndb_restore_partition.test:
  New BitKeeper file ``mysql-test/t/ndb_restore_partition.test''
 2006-06-14 12:21:18 +02:00
unknown
0795b20b62 Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): psot review comment: cleared flag before checking 2006-06-14 12:01:06 +02:00
unknown
cf0374854b Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster) 2006-06-14 11:08:36 +02:00
unknown
115cb627b0 Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index 
Don't rely on table->null_row when no index is used - it may be a multi-table
 2006-06-14 09:19:02 +02:00