Commit graph

6079 commits

Author SHA1 Message Date
unknown
d5292ebfb6 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-16 16:26:59 +02:00
unknown
11fdb2d387 row0mysql.c:
Test if merging from 3.23 to 4.0 succeeds


innobase/row/row0mysql.c:
  Test if merging from 3.23 to 4.0 succeeds
2003-03-16 14:40:41 +02:00
unknown
f08688c5ee trx0roll.c:
Fix compiler warning in Windows about ib_longlong to ulint conversion


innobase/trx/trx0roll.c:
  Fix compiler warning in Windows about ib_longlong to ulint conversion
2003-03-16 09:01:47 +02:00
unknown
3ad8b4c19c row0sel.c:
Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal


innobase/row/row0sel.c:
  Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal
2003-03-15 20:05:55 +02:00
unknown
3ce965da7a row0sel.c:
Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal


innobase/row/row0sel.c:
  Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal
2003-03-15 20:05:03 +02:00
unknown
41bad531ea - fixed C++-style comments to make IBM C compiler happy
client/mysqlshow.c:
   - fixed C++-style comment to make IBM C compiler happy
2003-03-15 18:42:55 +01:00
unknown
d8ea9fc972 - tagged ChangeSet 1.1358 as mysql-3.23.56
- bumped up version number to 3.23.57 in configure.in
2003-03-15 12:35:09 +01:00
unknown
11117565a3 merge with 3.23 to get:
- Fix for empty table/column names


mysql-test/t/create.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.pl:
  Auto merged
sql/filesort.cc:
  merge with 3.23
sql/sql_table.cc:
  merge with 3.23
tests/grant.res:
  merge with 3.23
2003-03-15 04:41:57 +02:00
unknown
13a5a24c61 Code cleanup
sql/sql_parse.cc:
  Removed not needed test
2003-03-15 04:34:06 +02:00
unknown
fcf035a0d8 Code cleanup 2003-03-14 23:06:55 +02:00
unknown
3d3e42547f Merge build:/home/bk/mysql-4.0
into mysql.com:/Users/mysqldev/my/mysql-4.0
2003-03-14 20:08:13 +01:00
unknown
ccc4e2d1da Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-14 17:11:38 +02:00
unknown
03b0df9481 Check for empty table/column names
mysql-test/t/create.test:
  Test for empty table/column name
tests/grant.pl:
  More tests
tests/grant.res:
  More tests
2003-03-14 17:08:42 +02:00
unknown
251a616f31 Small fixes in mysql_tableinfo. It's only code tiny changes, does not modify
the output of the script.


scripts/mysql_tableinfo.sh:
  Small fixes in this program which I contributed some time ago. These fixes
  are waiting in Monty's mailbox since August, and there are tiny :
  * use array{'x'} instead of array{x}
  * use fetchrow_arrayref instead of fetchrow_array
  * try to hide the command-line options from 'ps' like mysqlhotcopy does
  * use 'map' instead of homegrown function
  * use $_ instead of $i when possible
2003-03-14 16:07:15 +01:00
unknown
6d47e03f56 - we need to require an installation on the root volume (/usr/local/mysql) 2003-03-14 14:17:56 +01:00
unknown
11881c4289 ha_innobase.cc:
Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range


sql/ha_innobase.cc:
  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
2003-03-13 23:10:50 +02:00
unknown
f927267680 ha_innodb.cc:
Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range


sql/ha_innodb.cc:
  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
2003-03-13 23:09:25 +02:00
unknown
5a667a50a8 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-13 19:00:49 +01:00
unknown
ead5a5deab Merge
sql/filesort.cc:
  SCCS merged
2003-03-13 18:51:50 +01:00
unknown
ae01a3533b fix for crash with small sort_buffer 2003-03-13 18:46:40 +01:00
unknown
aca9fe2dfa Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-03-13 18:17:58 +01:00
unknown
2b051ccb81 - added option "--skip-disk-image" and short form "-s" in addition to the
already existing "--skip-dmg" (per Monty request)
 - Fixed handling of license files
2003-03-13 18:16:47 +01:00
unknown
d2d9910133 merged
sql/sql_base.cc:
  Auto merged
tests/grant.res:
  Auto merged
2003-03-13 17:57:24 +01:00
unknown
f3eb7fe0c3 Better fix for GRANT bug
tests/grant.pl:
  More options for test
tests/grant.res:
  new test results
2003-03-13 16:43:43 +02:00
unknown
ace956f490 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-13 14:47:58 +01:00
unknown
e97a000a65 make test result more obvious 2003-03-13 14:40:13 +01:00
unknown
012c8f9175 test result updated after merge 2003-03-13 14:34:07 +01:00
unknown
eec2f8ba2f - fixed newly added DBUG_RETURN to DBUG_VOID_RETURN (compile failed with
"DBUG_RETURN undeclared" on Mac OS X)
2003-03-13 13:52:15 +01:00
unknown
50da5c1858 merged
man/perror.1:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
mysql-test/r/analyse.result:
  ul
mysql-test/r/group_by.result:
  ul
mysql-test/r/select.result:
  ul
2003-03-13 13:44:03 +01:00
unknown
a4aaac02f3 texinfo syntax cleanup. 4.1 protocol sections are still too broken for this file to be compiled :( 2003-03-13 12:20:29 +01:00
unknown
d367d5ddb8 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2003-03-13 11:23:34 +01:00
unknown
c7551b8840 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-13 10:53:58 +01:00
unknown
3dfcd944fe Added PeterG's new internals documenation.
Docs/internals.texi:
  Added PeterG's new internals documentation.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-12 21:35:57 -08:00
unknown
606a23f551 VC++ InstallShield Setup Programs for 4.0.XX tree 2003-03-12 23:16:36 -04:00
unknown
8fa237edd3 better help message 2003-03-13 01:23:43 +01:00
unknown
b12b64a0c3 added comment 2003-03-12 22:50:22 +02:00
unknown
da9d94997c making sure that test works. 2003-03-12 20:33:41 +02:00
unknown
8209eb579e ha_myisam.cc:
typo fixed


sql/ha_myisam.cc:
  typo fixed
2003-03-12 18:32:27 +01:00
unknown
32208e0255 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-12 17:23:23 +02:00
unknown
8a2bd0d4ba Better fix for "Halloween" effect ... 2003-03-12 17:11:48 +02:00
unknown
ce194f04c5 Fix for a bug with column privileges ... 2003-03-12 17:08:48 +02:00
unknown
f16873ec9a Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-12 16:43:37 +02:00
unknown
72f44dafe6 NEWDATE -> DATE in anylyse() output
Changed that analyse(#) also affects strings


mysql-test/r/analyse.result:
  Better analyse test
mysql-test/t/analyse.test:
  Better analyse test
sql/sql_analyse.cc:
  NEWDATE -> DATE in anylyse() output
  Changed that analyse(#) also affects strings
  Fixed that number of elements in ENUM is limited by # not by #+1
2003-03-12 16:43:01 +02:00
unknown
40a781a6d6 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2003-03-12 14:48:00 +02:00
unknown
4976cd5529 Fix for --new option (Timestamp in YYYY-MM-DD HH:MM:SS format)
sql/field.cc:
  Fix for --new option
sql/field.h:
  Fix for --new option
2003-03-12 14:34:54 +02:00
unknown
cbbe5e8e2b A little bit improved test case 2003-03-12 14:34:07 +02:00
unknown
ab3c0ac156 Proper fix for INSERT DELAYED and --max-delayed-threads 2003-03-12 08:08:07 +02:00
unknown
0e812fc4b1 Fix for replication of INSERT | REPLACE | CREATE ... SELECT
sql/sql_select.cc:
  Fix for repllication of INSERT | REPLACE | CREATE  ... SELECT
2003-03-12 07:51:08 +02:00
unknown
5cd07da765 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
2003-03-12 05:21:31 +02:00
unknown
6d7aa8336c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0


sql/sql_select.cc:
  Auto merged
2003-03-12 01:06:21 +01:00