Commit graph

8455 commits

Author SHA1 Message Date
ram@mysql.r18.ru
f55db178a2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1.gis
2003-06-23 18:38:45 +05:00
bell@sanja.is.com.ua
7b7892afad Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1
2003-06-23 00:02:20 +03:00
bar@bar.mysql.r18.ru
4c7714b7f9 item_cmpfunc.cc:
Temporarily fix for test failure
  ,.
2003-06-20 19:05:45 +05:00
bar@bar.mysql.r18.ru
f78a77798c item_cmpfunc.cc:
Rewritten in nicer way
  ,
2003-06-20 18:45:28 +05:00
lenz@kallisto.local
7a6059cc88 - make sure that scripts/*.sql files are being added to the source
distribution as well
2003-06-20 13:57:51 +02:00
bell@sanja.is.com.ua
e17ad368af Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1
2003-06-20 13:40:21 +03:00
ram@mysql.r18.ru
a89a7eb327 Renamed xxx_as_text() and xxx__from_text(). 2003-06-20 14:53:37 +05:00
ram@mysql.r18.ru
528386fc78 Added AsWKT() alias for AsText().
Renamed as_text().
2003-06-20 14:31:47 +05:00
miguel@hegel.(none)
354af955bc Fix error msg. Bug #681 2003-06-19 12:17:23 -04:00
bell@sanja.is.com.ua
8ac294c9ac after merge fix 2003-06-19 16:08:11 +03:00
bell@sanja.is.com.ua
096ae170ae Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1
2003-06-19 15:25:41 +03:00
lenz@mysql.com
431b08c327 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2003-06-19 13:48:12 +02:00
lenz@mysql.com
6cd5eb8e28 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2003-06-19 13:46:32 +02:00
lenz@kallisto.local
873f6d87be - added missing include/sql_state.h to source distribution 2003-06-19 13:46:10 +02:00
igor@rurik.mysql.com
acdc9c59a7 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 03:40:48 -07:00
lenz@mysql.com
8f4794822f Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-06-19 12:19:28 +02:00
lenz@kallisto.local
1908cc62b6 - revert wrong include of zlib.h as zlib is not part of the source
distribution - better use -I../zlib where appropriate (usually we use
   the zlib installed in the system)
2003-06-19 12:18:04 +02:00
igor@rurik.mysql.com
63691e27a2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 02:42:49 -07:00
igor@rurik.mysql.com
98eeaa54f3 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-19 02:39:46 -07:00
igor@rurik.mysql.com
3ed12d5a74 preload.result, preload.test:
Removed non-generic info (key used blocks)
preload.result, preload.test, lex.h, sql_yacc.yy:
  Syntax change for preload statement
2003-06-19 02:34:33 -07:00
bar@bar.mysql.r18.ru
e701ece00c Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-06-19 13:49:28 +05:00
lenz@kallisto.local
853c3dd77f - added libmysql/client_settings.h to distribution 2003-06-19 10:46:45 +02:00
bar@bar.mysql.r18.ru
069e57bd2f Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-06-19 13:13:40 +05:00
bar@bar.mysql.r18.ru
ebb88ec6ea LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations 2003-06-19 13:12:55 +05:00
igor@rurik.mysql.com
5a6d0da277 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 00:01:16 -07:00
bar@bar.mysql.r18.ru
69af692a5c These functions now return a result of proper collation:
BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE
2003-06-19 11:36:44 +05:00
igor@rurik.mysql.com
f804b783fb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-18 23:16:08 -07:00
lenz@kallisto.local
a7f584da79 - added sql-common subdirectory and sql_common.h to source distribution 2003-06-18 23:13:29 +02:00
lenz@kallisto.local
67779aff2c Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-06-18 21:45:46 +02:00
paul@teton.kitebird.com
eeb987ddd7 INSTALL-WIN-SOURCE:
More edits to INSTALL-WIN-SOURCE.
2003-06-18 12:10:40 -05:00
igor@rurik.mysql.com
5425591503 Merge 2003-06-18 07:31:23 -07:00
serg@sergbook.mylan
242ee84fb9 triggers magic
enforce REAL_EMAIL
2003-06-18 14:12:50 +02:00
lenz@mysql.com
e7e5ccb547 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-06-18 09:49:56 +02:00
paul@teton.kitebird.com
4b80090f19 INSTALL-WIN-SOURCE:
Initial cleanup edits.
2003-06-17 17:47:23 -05:00
venu@myvenu.com
75b8cb2036 Fix for --dirname and --suffix (missed ones) 2003-06-17 14:29:20 -07:00
venu@myvenu.com
b648691535 Added new HOWTO doc 'INSTALL-WIN-SOURCE' on building 'mysql clients and server' on WINDOWS from BitKeeper as well as from distributed source archive 2003-06-17 12:22:57 -07:00
bar@bar.mysql.r18.ru
319124508a The default collation for cp1251 has been changed to general_ci 2003-06-17 18:10:35 +05:00
lenz@mysql.com
3b7911d367 - changed "password" to "Password" as suggested by Paul DuBois to be
consistent with the other column names in the table.
2003-06-16 10:32:49 +02:00
serg@serg.mylan
0d02b972db Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-16 00:13:25 +02:00
monty@narttu.mysql.fi
c1f1107b2a Add missing defines 2003-06-16 01:13:24 +03:00
serg@serg.mylan
7a08f3653b bad merge fixed 2003-06-16 00:13:23 +02:00
monty@narttu.mysql.fi
08c5691086 merge 2003-06-16 01:13:23 +03:00
hf@deer.(none)
60a260d86d Fix for compilation error.
Compiler can signal error when init_sigpipe_variables expands as empty place.
Had to remove all semicolons after init_sigpipe_variables
2003-06-16 03:13:22 +05:00
vva@eagle.mysql.r18.ru
b34be94f4b Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2003-06-15 18:13:21 -04:00
monty@narttu.mysql.fi
e090f2d0cc Fixes for make_win_src_distributions
Removed compiler warnings
2003-06-15 23:24:37 +03:00
monty@narttu.mysql.fi
d33cb08eb6 LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows. 2003-06-15 12:34:04 +03:00
vva@eagle.mysql.r18.ru
7bca3e774d fixed bug with './' prefix in mysql_install_db 2003-06-14 17:33:25 -04:00
monty@narttu.mysql.fi
1e62d6070a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-06-14 11:38:09 +03:00
monty@narttu.mysql.fi
a1034db4b9 Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
2003-06-14 11:37:42 +03:00
serg@serg.mylan
002d842012 bug #251 - destroyed object reused - fixed 2003-06-13 23:00:04 +02:00