Commit graph

58475 commits

Author SHA1 Message Date
Guilhem Bichot
12e822039d Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":
DECIMAL and TIMESTAMP used to have NUM_FLAG, but NEWDECIMAL was forgotten.
It's correct that TIMESTAMP does not have the flag nowadays (manual will be updated, connectors
developers will be notified).

client/mysqldump.c:
  IS_NUM_FIELD(f) removed and replaced by its definition (f>flags & NUM_FLAG).
include/mysql.h:
  - IS_NUM_FIELD() is removed because name is too close to IS_NUM() and it is not used a lot
  - INTERNAL_NUM_FIELD() is removed:
    * it forgets to test NEWDECIMAL (when IS_NUM() was updated for NEWDECIMAL we forgot
    to update INTERNAL_NUM_FIELD()), that's why client didn't mark NEWDECIMAL with NUM_FLAG (a bug).
    * it has an obsolete test for length of the TIMESTAMP field: test became accidentally wrong when length
    of TIMESTAMP was changed to always be 19 (when the format was changed from YYYYMMDDhhmmss to
    YYYY-MM-DD hh:mm:ss), never 8 or 14 anymore. That obsolete test caused TIMESTAMP to lose NUM_FLAG,
    which was an accidental but good change (see below).
    * IS_NUM() should be used instead
  - IS_NUM(f) is changed: TIMESTAMP used to be parsable as a number without quotes (when it was formatted as
  "YYYYMMDDhhmmss"); but it is not anymore (now that it is "YYYY-MM-DD hh:mm:ss"), so it should not have NUM_FLAG
  (mysqldump needs to quote TIMESTAMP values), so IS_NUM() should return false for it.
libmysqld/lib_sql.cc:
  use IS_NUM() instead of INTERNAL_NUM_FIELD()
mysql-test/r/bigint.result:
  result change: NEWDECIMAL fields now have NUM_FLAG (32768)
mysql-test/r/metadata.result:
  result change: NEWDECIMAL fields now have NUM_FLAG (32768)
mysql-test/r/mysqldump.result:
  DECIMAL columns are not quoted anymore by mysqldump. Which is ok, the parser does not need '' for them
mysql-test/r/ps_2myisam.result:
  result change: NEWDECIMAL fields now have NUM_FLAG (32768)
mysql-test/r/ps_3innodb.result:
  result change: NEWDECIMAL fields now have NUM_FLAG (32768)
mysql-test/r/ps_4heap.result:
  result change: NEWDECIMAL fields now have NUM_FLAG (32768)
mysql-test/r/ps_5merge.result:
  result change: NEWDECIMAL fields now have NUM_FLAG (32768)
mysql-test/suite/ndb/r/ps_7ndb.result:
  result change: NEWDECIMAL fields now have NUM_FLAG (32768)
mysql-test/t/metadata.test:
  test for BUG#42980
sql-common/client.c:
  use IS_NUM() instead of INTERNAL_NUM_FIELD()
2009-09-30 12:25:50 +02:00
Mikael Ronstrom
ccae404afa Merge to mysql-next-mr 2009-09-28 09:39:50 +02:00
Alexander Nozdrin
a8edd0aabb Update default.conf. 2009-09-28 00:54:22 +04:00
Alexander Nozdrin
bc11a8d044 Merge from mysql-next-mr. 2009-09-25 18:58:53 +04:00
Alexander Nozdrin
db5c088b45 Merge from mysql-trunk (update default.conf). 2009-09-25 13:47:58 +04:00
Alexander Nozdrin
3baea8b9e8 Update default.conf 2009-09-25 13:42:54 +04:00
Alexander Nozdrin
c991aa4e1a Merge from mysql-trunl-alik. 2009-09-25 13:40:53 +04:00
Alexander Nozdrin
3f0caab6e5 Mark rpl.rpl_innodb_bug30888 experimental. 2009-09-25 13:40:25 +04:00
Alexander Nozdrin
20430985f9 Merge from mysql-trunl-alik. 2009-09-25 13:23:30 +04:00
Alexander Nozdrin
350fad0e46 Mark rpl.rpl_trigger experimental. 2009-09-25 13:21:49 +04:00
Alexander Nozdrin
f4b49e55cd Merge from mysql-trunk-alik (stabilizing changes). 2009-09-24 16:40:09 +04:00
Alexander Nozdrin
63b2a5ac78 Merge from mysql-next-mr. 2009-09-24 16:38:47 +04:00
Alexander Nozdrin
b893cc510c Disable ndb and rpl_ndb test suites from regular tests. 2009-09-24 16:30:13 +04:00
Alexander Nozdrin
45921153db Mark some tests experimental.
Update default.conf.
2009-09-24 16:29:29 +04:00
Vladislav Vaintroub
626bac8471 merge mysql-next-mr-alik 2009-09-24 12:35:16 +02:00
Vladislav Vaintroub
2b2ef99ebf merge 2009-09-23 22:19:11 +02:00
Vladislav Vaintroub
7ddb103b8e merge 2009-09-23 22:15:22 +02:00
Alexander Nozdrin
4e83ce7ce7 Merge from mysql-trunk. 2009-09-23 22:52:21 +04:00
Alexander Nozdrin
41a8a63857 Update disabled.def files. 2009-09-23 22:50:13 +04:00
Alexander Nozdrin
b0220ff9ff Ignore a new symbolic link. 2009-09-23 18:02:39 +04:00
Alexander Nozdrin
ff83a42853 Merge mysql-trunk-signal (into mysql-next-mr-alik, which is mysql-next-mr). 2009-09-23 17:57:39 +04:00
Alexander Nozdrin
7947948c52 Update default.conf. 2009-09-23 14:12:43 +04:00
Alexander Nozdrin
8b9361663d Merge from mysql-next-mr. 2009-09-23 14:11:41 +04:00
Alexander Nozdrin
44927973c0 Merge from mysql-trunk. 2009-09-23 14:10:04 +04:00
Alexander Nozdrin
7cd113e57c Update default.conf. 2009-09-23 14:08:38 +04:00
Alexander Nozdrin
5a361c26cf Update default.conf. 2009-09-23 14:04:08 +04:00
Alexander Nozdrin
b42b46142d Merge from mysql-trunk. 2009-09-23 13:59:23 +04:00
Alexander Nozdrin
5f6299cfe7 Merge from mysql-trunk-alik. 2009-09-23 13:51:45 +04:00
Alexander Nozdrin
60781e320f Update version in configure.in. 2009-09-23 13:50:31 +04:00
Alexander Nozdrin
aaae814e14 Merge from mysql-trunk(-alik). 2009-09-23 11:17:49 +04:00
Alexander Nozdrin
68a9b7dbe3 Merge from mysql-5.1. 2009-09-23 11:16:11 +04:00
Bjorn Munch
60bd6508b6 merge 5.1-mtr -> 5.1 -> trunk 2009-09-23 00:49:34 +02:00
Bjorn Munch
868d45c80f merge from 5.1 of merge from 5.1-mtr 2009-09-22 23:41:37 +02:00
Marc Alff
1ecaf1bc1e Merge mysql-next-mr (revno 2882) --> mysql-trunk-signal 2009-09-22 09:22:22 -06:00
Alexander Nozdrin
9e9b8f32d7 Merge from mysql-next-mr. 2009-09-22 18:26:17 +04:00
Alexander Nozdrin
addd7298bf Merge from mysql-trunk. 2009-09-22 18:24:53 +04:00
Alexander Nozdrin
3b494279bb Merge from mysql-trunk. 2009-09-22 18:23:12 +04:00
Alexander Nozdrin
dcf935a198 Update version. 2009-09-22 18:21:44 +04:00
Bjorn Munch
8ff5366c06 merge from trunk (with trunk-mtr) 2009-09-22 14:39:18 +02:00
Bjorn Munch
3df9e7358e merge from trunk-mtr 2009-09-22 12:52:31 +02:00
Jonathan Perkin
e465d11383 Merge from mysql-5.1.39-release 2009-09-21 12:10:32 +02:00
Bjorn Munch
bb181d25cb new merge from trunk 2009-09-21 11:43:01 +02:00
Bjorn Munch
4a75d269ce tiny suppression fix: avoid / 2009-09-21 11:28:49 +02:00
Marc Alff
4fa77f94b6 Merge mysql-next-mr (revno 2880) --> mysql-trunk-signal 2009-09-20 22:50:05 -06:00
Alexander Nozdrin
18f7dd0fad Update default.experimental. 2009-09-20 01:09:02 +04:00
Alexander Nozdrin
4d3c995e8b Merge from mysql-trunk. 2009-09-19 13:38:17 +04:00
Alexander Nozdrin
9d8c023859 Mark some tests experimental. 2009-09-19 13:37:22 +04:00
Alexander Nozdrin
ede2edd19b Merge from mysql-5.1. 2009-09-19 13:07:51 +04:00
Alexander Nozdrin
159e42fc08 Merge next-mr -> next-mr-bugfixing. 2009-09-18 19:24:18 +04:00
Alexander Nozdrin
23364d6920 Merge trunk -> trunk-bugfixing. 2009-09-18 19:23:44 +04:00