Commit graph

14209 commits

Author SHA1 Message Date
joerg@mysql.com
36d93f402c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-08-26 20:43:58 +02:00
lenz@mysql.com
e876d6f4da - typo fix - make sure to include an existing file in the source
distribution...
2004-08-26 19:46:11 +02:00
serg@serg.mylan
08f3ba0e29 after merge 2004-08-26 18:22:22 +02:00
serg@serg.mylan
5633414c8f Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 17:51:21 +02:00
serg@serg.mylan
acbf96a161 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 17:49:16 +02:00
serg@serg.mylan
0712f34d72 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-26 17:49:04 +02:00
joerg@mysql.com
10cf7f1f38 If the system has 64 bit "long", then "long long" does not add new
functionality. The existing code takes advantage of this when
"typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs.
If the compiler then has prototypes for C99 functions 'strtoll()' and
'strtoull()' but no implementation, the existing code in 'strtoull.c'
collides with that prototype. These collisions are avoided now.
2004-08-26 17:30:53 +02:00
monty@mysql.com
ceba1429b7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-08-26 18:27:33 +03:00
monty@mysql.com
ea687ba5da Portability fixes
Fixed bug in end space handle for WHERE text_column="constant"
2004-08-26 18:26:38 +03:00
miguel@hegel.txg.br
2c18195e73 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0
into hegel.txg.br:/home/miguel/bk/mysql-4.0
2004-08-26 11:44:02 -03:00
serg@serg.mylan
88e76d4a6e Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 15:33:52 +02:00
serg@serg.mylan
a9e98dd7c6 remove warning 2004-08-26 15:32:57 +02:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
jani@rhols221.adsl.netsonic.fi
5e4df770e3 Fixed a bug in mysql.cc. Overriding password prompting
by giving password as an argument later did not work.
2004-08-26 16:15:36 +03:00
ram@gw.mysql.r18.ru
9bc14a9605 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
2004-08-26 17:52:07 +05:00
ram@gw.mysql.r18.ru
49868b9fd4 Should check for GEOM_FLAG later because keyX may be partly initialized (min_flag is not set). 2004-08-26 17:43:08 +05:00
pekka@mysql.com
938c9bcfb1 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-08-26 14:29:52 +02:00
pekka@mysql.com
492db98edd FileLogHandler.cpp, ndb_global.h:
sco and others: use PATH_MAX always
2004-08-26 14:06:39 +02:00
ram@gw.mysql.r18.ru
2a29cb0204 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
2004-08-26 16:54:33 +05:00
ram@gw.mysql.r18.ru
2133721ac6 A fix (Bug#5219: Cannot use '||' with MBRContains(..)). 2004-08-26 16:51:26 +05:00
rburnett@build.mysql.com
0e44c9fdab Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-26 13:43:27 +02:00
bar@mysql.com
87537752e2 "SELECT BINARY x" now means "SELECT CAST(x AS BINARY)". 2004-08-26 16:31:37 +05:00
pekka@mysql.com
c726ab10e5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-08-26 13:25:10 +02:00
pekka@mysql.com
a4099c22f0 sco compile fix: MAXPATHLEN 2004-08-26 13:25:09 +02:00
lenz@mysql.com
5de9718b1e Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-08-26 12:36:48 +02:00
lenz@mysql.com
b9270a16fd - Updated RPM spec file: MySQL-Max now requires MySQL-server instead
of MySQL (BUG#3860)
2004-08-26 12:25:14 +02:00
monty@mysql.com
f40a693a89 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-08-26 13:18:10 +03:00
joreland@mysql.com
8730615694 Fix ndb home path 2004-08-26 12:10:32 +02:00
joerg@mysql.com
f4bcf0f3ee Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
2004-08-26 11:02:53 +02:00
bar@mysql.com
9a6b76aa90 ctype-latin1.c:
Revert this change, it was done in a mistake.
2004-08-26 12:02:11 +05:00
monty@mysql.com
91ec38a74e merge 2004-08-26 00:39:43 +03:00
monty@mysql.com
4fccf1c4ac Remove default argument to mysql_truncate()
Update to new valgrind
2004-08-26 00:37:25 +03:00
paul@kite-hub.kitebird.com
b5274f3f73 mysql.h:
Fix a misleading plural that should be singular.
  Fix other typos while I'm at it.
2004-08-25 12:52:19 -05:00
rburnett@build.mysql.com
1e0e96a0d2 Test case for Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list
lowercase_table.result:
  New results for modified lowercase_table test
lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792
2004-08-25 17:25:38 +02:00
konstantin@mysql.com
dd601de64f Cleanup. 2004-08-25 17:20:12 +04:00
rburnett@build.mysql.com
358900236a Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list
sql_base.cc:
  Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792
2004-08-25 15:12:31 +02:00
bar@mysql.com
65b7032857 mysql.cc:
Bug#3453: MySQL output formatting in multibyte character sets
2004-08-25 13:03:34 +05:00
bar@mysql.com
f81edf4afd A new function to meassure terminal screen cells number for a string. 2004-08-25 11:39:43 +05:00
bar@mysql.com
766eb867da utr11-dump.c:
new file
2004-08-25 10:15:46 +05:00
miguel@hegel.txg.br
1ebe827dbe Adding binary version information for debug/release version of libmysqld.dll
This was a customer request for to get the XP Logo Certification.

Note for LenZ:
Adding to the project libmysqld.dsp the file libmysqld.rc at compilation time will be created
the libmysqld.res and this linked. For every release edit the libmysqld.rc
version number.
2004-08-25 02:04:45 -03:00
rburnett@build.mysql.com
52a973c5ff Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-25 06:39:19 +02:00
mskold@mysql.com
a2bcb2a558 Cleaned up rnd_init 2004-08-24 23:13:32 +02:00
tomas@poseidon.(none)
4ca548bcc6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 21:13:31 +00:00
tomas@poseidon.(none)
1bd774e9cb more aliases in ndb config 2004-08-24 21:12:53 +00:00
serg@serg.mylan
0c950c5bfe compatibility fixes 2004-08-24 22:37:05 +02:00
serg@serg.mylan
1538c318c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:37:04 +02:00
tomas@poseidon.(none)
c81df5a0ae Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 20:37:03 +00:00
serg@serg.mylan
19f7592206 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:37:03 +02:00
konstantin@mysql.com
a603cdb72d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-5034
2004-08-25 00:37:02 +04:00
vva@eagle.mysql.r18.ru
f4c23c12ba committed skipped file 2004-08-25 01:37:01 +05:00