Commit graph

32818 commits

Author SHA1 Message Date
serg@serg.mylan
ec61fe292a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-06 22:28:45 +02:00
ingo@mysql.com
33ff3e37a3 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-aid
2006-04-06 20:55:25 +02:00
igreenhoe@mysql.com
fe9b9c61d2 Merge mysql.com:/home/greenman/workspace-mysql/mysql/mysql-5.0
into  mysql.com:/home/greenman/workspace-mysql/mysql/bug-5.0-16240
2006-04-06 10:42:34 -07:00
sergefp@mysql.com
f962fa5b91 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/psergey/mysql-5.0-bug18237-review
2006-04-06 21:42:33 +04:00
sergefp@mysql.com
be0ebd9e0a Remove redundant code in opt_sum_query() 2006-04-06 21:42:03 +04:00
sergefp@mysql.com
44628436e5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18558-pnd
2006-04-06 21:26:23 +04:00
sergefp@mysql.com
68bd945ca3 BUG#18558 "Partition pruning results are incorrect for certain class of WHERE clauses" :
* Produce right results for conditions that were transformed to "(partitioning_range) AND
  (list_of_subpartitioning_ranges)": make each partition id set iterator auto-reset itself
  after it has returned all partition ids in the sequence 
* Fix "Range mapping" and "Range mapping" partitioning interval analysis functions to 
  correctly deal with NULL values.
2006-04-06 21:23:33 +04:00
igreenhoe@mysql.com
84bfed689d Fix for Bug #16240 2006-04-06 10:13:46 -07:00
joerg@mysql.com
73a0ae9d9b Backport of 5.1 test options "--with-ndbcluster" and "--with-ndbcluster-only" as dummies (ignored). 2006-04-06 18:42:07 +02:00
knielsen@mysql.com
534a87dda2 Remove no longer needed generation of dummy ib_config.h 2006-04-06 17:03:01 +02:00
jonas@perch.ndb.mysql.com
cb8084d446 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-06 16:31:34 +02:00
jonas@perch.ndb.mysql.com
327adcf461 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-06 16:25:19 +02:00
jonas@perch.ndb.mysql.com
5904a94655 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-04-06 16:19:22 +02:00
jonas@perch.ndb.mysql.com
f41db42287 ndb - bug#18612 - post review fixes
1) make sure that check_multi_node_shutdown does not proceed (in stop case)
  2) Fix printout
2006-04-06 16:18:42 +02:00
serg@serg.mylan
6f492397f8 changes to make plugin_example useful as a template:
force pkglibdir to be in "mysql" package, template files:
AUTHORS, ChangeLog, NEWS, README, configure.in
2006-04-06 16:07:53 +02:00
serg@serg.mylan
cc3c065aa9 Bug#18836 - fulltext parser plugin is called recursively.
Don't use the same param in recursive call.
Also, the fix makes it safe for a plugin to replace param->mysql_add_word
2006-04-06 16:03:04 +02:00
serg@serg.mylan
c708c11633 fixed reading of free'd memory when opening a table with non-existing plugin 2006-04-06 15:49:00 +02:00
serg@serg.mylan
13902e1de5 Bug#17112 - SHOW PLUGIN should be SHOW PLUGINS 2006-04-06 15:29:39 +02:00
ingo@mysql.com
5c689e3382 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-aid
2006-04-06 14:38:49 +02:00
jonas@perch.ndb.mysql.com
f609313d4c Merge perch.ndb.mysql.com:/home/jonas/src/51-jonas
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-06 14:35:07 +02:00
svoj@april.(none)
fb37c30699 Merge april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.1-new
2006-04-06 16:44:26 +05:00
bar@mysql.com
3c2e84f7f3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-06 16:24:54 +05:00
jonas@perch.ndb.mysql.com
1617e5cb25 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-06 13:18:13 +02:00
svoj@april.(none)
85ff7bec70 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
2006-04-06 15:25:39 +05:00
jonas@perch.ndb.mysql.com
85c12f71d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-06 12:23:07 +02:00
svoj@april.(none)
209682e051 Fix for bug#14945 "Truncate table doesn't reset the auto_increment
counter".

When TRUNCATE TABLE was called within an stored procedure the
auto_increment counter was not reset to 0 even if straight
TRUNCATE for this table did this.

This fix makes TRUNCATE in stored procedures to be handled exactly
in the same way as straight TRUNCATE. We achieve this by rolling
back the fix for bug 8850, which is no longer needed since stored
procedures don't require prelocked mode anymore (and TRUNCATE is
not allowed in stored functions or triggers).
2006-04-06 15:19:01 +05:00
jonas@perch.ndb.mysql.com
3e2daff86c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-06 12:01:50 +02:00
jonas@perch.ndb.mysql.com
a68db45128 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-06 11:55:36 +02:00
jonas@perch.ndb.mysql.com
bd7a574035 post merge fixes 2006-04-06 11:51:24 +02:00
jonas@perch.ndb.mysql.com
40d83bdf6e ndb - wl1760/bug#18216
add two new start options that will decrease likelyhood of bug#18612
  push cntr-sp2 logic down into qmgr-sp1 to decrease likelyhood of bug#18612
2006-04-06 11:43:31 +02:00
msvensson@shellback.(none)
e1348410d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-04-06 11:38:50 +02:00
msvensson@shellback.(none)
cd15f309fb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-04-06 10:34:41 +02:00
bar@mysql.com
0524cdbe70 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-06 13:08:07 +05:00
bar@mysql.com
13b5cdb126 Moving mysql_get_server_version() from libmysql.c to client.c,
as it is now required by mysql_set_character_set()
2006-04-06 13:03:22 +05:00
bar@mysql.com
f8a178000d Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-06 12:53:21 +05:00
bar@mysql.com
14846536a4 client.c:
Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.
2006-04-06 12:43:13 +05:00
bar@mysql.com
6a847761f1 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-06 12:38:24 +05:00
stewart@mysql.com
ef4c0d8042 Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new-bug18831
2006-04-06 17:24:02 +10:00
stewart@mysql.com
c7f3ce1148 BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump test
don't know why this didn't generate a warning, but let's fix it too.
2006-04-06 17:13:17 +10:00
stewart@mysql.com
f54a2ff55b BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump test 2006-04-06 17:02:56 +10:00
bar@mysql.com
ceb0a0b2d5 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-06 12:00:14 +05:00
bar@mysql.com
45a3bb57d6 libmysql.c:
Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.
2006-04-06 11:47:46 +05:00
ingo@mysql.com
c228bd4179 Merge mysql.com:/home/mydev/mysql-5.1-bug18477
into  mysql.com:/home/mydev/mysql-5.1-aid
2006-04-06 08:40:38 +02:00
ingo@mysql.com
26f1663d82 Merge mysql.com:/home/mydev/mysql-5.1-bug5390
into  mysql.com:/home/mydev/mysql-5.1-aid
2006-04-06 08:38:27 +02:00
bar@mysql.com
0459d69d7a Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-06 10:53:42 +05:00
bar@mysql.com
925ea02b4c This problem has already been fixed by one of the previous changes.
Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
2006-04-06 10:51:23 +05:00
bar@mysql.com
a83d206811 ctype-extra.c:
Using local.
2006-04-06 10:23:42 +05:00
bar@mysql.com
743f96da9c Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-06 10:21:33 +05:00
bar@mysql.com
8f1bddb8ed conf_to_src.c:
Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.
2006-04-06 10:17:01 +05:00
jonas@perch.ndb.mysql.com
11bbc4e8e5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-05 23:25:26 +02:00