1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-05 12:42:17 +03:00
Commit Graph

14219 Commits

Author SHA1 Message Date
e85ce08901 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 14:02:02 +02:00
10b88b37b7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-27 15:56:27 +05:00
b10dcf7aa6 grant.result:
Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.
2004-08-27 15:55:16 +05:00
b2f60188df Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 08:54:34 +02:00
9366988718 Adding the file needed for windows build (on behalf of Reggie) 2004-08-27 03:27:16 +04:00
6df66180bd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 01:01:47 +02:00
95e5b457b8 Fix ordered index scan with partially specified key 2004-08-27 00:59:16 +02:00
0cde6e4dcb Do-compile:
Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
2004-08-26 16:44:01 -05:00
762771d8dc Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-5126
2004-08-26 22:48:05 +04:00
46f1922fb5 A short fix and test case for Bug#5126
"Mediumint and PS problem": just treat mediumint as long.
2004-08-26 22:47:34 +04:00
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
e876d6f4da - typo fix - make sure to include an existing file in the source
distribution...
2004-08-26 19:46:11 +02:00
08f3ba0e29 after merge 2004-08-26 18:22:22 +02:00
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
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
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
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
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
ea687ba5da Portability fixes
Fixed bug in end space handle for WHERE text_column="constant"
2004-08-26 18:26:38 +03:00
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
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
a9e98dd7c6 remove warning 2004-08-26 15:32:57 +02:00
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
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
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
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
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
492db98edd FileLogHandler.cpp, ndb_global.h:
sco and others: use PATH_MAX always
2004-08-26 14:06:39 +02:00
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
2133721ac6 A fix (Bug#5219: Cannot use '||' with MBRContains(..)). 2004-08-26 16:51:26 +05:00
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
87537752e2 "SELECT BINARY x" now means "SELECT CAST(x AS BINARY)". 2004-08-26 16:31:37 +05:00
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
a4099c22f0 sco compile fix: MAXPATHLEN 2004-08-26 13:25:09 +02:00
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
b9270a16fd - Updated RPM spec file: MySQL-Max now requires MySQL-server instead
of MySQL (BUG#3860)
2004-08-26 12:25:14 +02:00
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
8730615694 Fix ndb home path 2004-08-26 12:10:32 +02:00
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
9a6b76aa90 ctype-latin1.c:
Revert this change, it was done in a mistake.
2004-08-26 12:02:11 +05:00
91ec38a74e merge 2004-08-26 00:39:43 +03:00
4fccf1c4ac Remove default argument to mysql_truncate()
Update to new valgrind
2004-08-26 00:37:25 +03:00
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
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
dd601de64f Cleanup. 2004-08-25 17:20:12 +04:00
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
65b7032857 mysql.cc:
Bug#3453: MySQL output formatting in multibyte character sets
2004-08-25 13:03:34 +05:00
f81edf4afd A new function to meassure terminal screen cells number for a string. 2004-08-25 11:39:43 +05:00
766eb867da utr11-dump.c:
new file
2004-08-25 10:15:46 +05:00
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