serg@serg.mylan
e88e650d5e
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-09 22:28:15 +02:00
serg@serg.mylan
a2b53947e0
more DBUG_xxx tags
2003-06-09 22:26:22 +02:00
venu@myvenu.com
d764294f12
Fix for mysql_list_fields & reset stmt buffers from stmt_free_result
...
Windows build fix
2003-06-08 09:11:14 -07:00
gluh@gluh.mysql.r18.ru
b68eab61a6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.revoke
2003-06-06 17:44:33 +05:00
gluh@gluh.mysql.r18.ru
7d020eae17
REVOKE all privileges and delete user(244)
2003-06-06 17:43:23 +05:00
bar@bar.mysql.r18.ru
a6757c15df
client.c:
...
Compilation falure fix
2003-06-06 11:06:45 +05:00
bar@bar.mysql.r18.ru
eb0727c142
my_global.h:
...
ulong was used before the line it have been declared
2003-06-06 10:50:13 +05:00
monty@narttu.mysql.fi
059b1e5612
After merge fixes
2003-06-05 23:19:56 +03:00
monty@narttu.mysql.fi
0303cd572f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-06-05 23:19:55 +03:00
vva@eagle.mysql.r18.ru
27cbc507fa
fixed bug (writting outside mallocced buffer in sql_help.cc)
2003-06-05 16:19:54 -04:00
monty@narttu.mysql.fi
7a54334443
Merge with 4.0.13
2003-06-05 17:33:38 +03:00
monty@narttu.mysql.fi
e6cdc81613
Added function comment
2003-06-05 17:25:09 +03:00
jani@ua126d19.elisa.omakaista.fi
d793db2bb9
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2003-06-05 16:57:36 +03:00
jani@ua126d19.elisa.omakaista.fi
058d8ed14b
mysqld won't give a warning any more, if --user=user_name is used,
...
if 'user_name' is the current user and it is not root.
2003-06-05 16:56:38 +03:00
heikki@hundin.mysql.fi
e09517e2ac
ha_innodb.cc:
...
Revert a change to dict_mem_index_add_field which slipped prematurely into the bk tree
2003-06-05 16:06:38 +03:00
heikki@hundin.mysql.fi
c2e5f48412
ha_innodb.cc, handler.cc:
...
Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB
2003-06-05 15:58:23 +03:00
monty@narttu.mysql.fi
4851b571bb
Merged fix for alarm on big blocks
2003-06-05 15:21:10 +03:00
monty@narttu.mysql.fi
de0a3d3036
Fixed test if thr_alarm() failed
2003-06-05 15:15:27 +03:00
jani@ua126d19.elisa.omakaista.fi
9262cf2fb9
Merge jani@192.168.0.2:/my/mysql-4.0
...
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2003-06-05 15:07:28 +03:00
jani@ua126d19.elisa.omakaista.fi
4b55fbe092
Fixed a bug in concat_ws(), which did not add concat separator
...
in case of an empty string. Bug ID 586.
2003-06-05 15:06:19 +03:00
monty@narttu.mysql.fi
772adcbd99
Print error if we can't delete an alarm
...
More debugging variables
Increment aborted_threads in case of killed or too big packet
2003-06-05 12:29:13 +03:00
monty@narttu.mysql.fi
6876111f8f
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-06-05 12:17:46 +03:00
monty@narttu.mysql.fi
aeb655e04c
Merge with 3.23 to get fix for thr_alarm and big packets
2003-06-05 12:00:06 +03:00
monty@narttu.mysql.fi
cd3b680db0
Fixed problem with alarms when reading too big packet
2003-06-05 11:55:03 +03:00
monty@narttu.mysql.fi
dad0664579
merge with public tree
2003-06-05 00:12:45 +03:00
lenz@mysql.com
efb28021f5
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0
2003-06-04 22:38:35 +02:00
lenz@mysql.com
810e3bff14
- When compiling the Max package incl. RAID support using gcc, make sure
...
to set CXX=gcc (cannot link the code with g++) - this should help to
recompile the RPM on Distributions using gcc 3
- Added a symlink /usr/sbin/rcmysql -> /etc/init.d/mysql
2003-06-04 22:31:06 +02:00
monty@narttu.mysql.fi
8ad4a240d2
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-06-04 23:17:45 +03:00
monty@narttu.mysql.fi
f5bb1e0907
After merge fix
2003-06-04 23:17:01 +03:00
monty@narttu.mysql.fi
40109c574a
Merge with 4.0.13
2003-06-04 19:21:51 +03:00
lenz@mysql.com
7947830b2d
- Updated Default-Stop run levels in the LSB header section to satisfy
...
Red Hat's chkconfig (Bug #272 ) (The LSB spec is a bit ambigous about
what actually needs to be put into this field)
2003-06-04 17:31:21 +02:00
monty@narttu.mysql.fi
23145cfed7
Added SQLSTATE to client/server protocol
...
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
monty@narttu.mysql.fi
6217b578b9
Fixed (not fatal) buffer overflow
2003-06-04 18:22:48 +03:00
heikki@hundin.mysql.fi
42c80c81f7
handler.cc:
...
If the autocommit is on, let handler.cc commit or rollback the whole transaction at an updating SQL statement end. This probably fixes bug number 578. The problem was that when explicit LOCK TABLES is used, then the lock count method in autocommit does not work.
2003-06-04 17:58:41 +03:00
monty@narttu.mysql.fi
100a66e6cb
Added [mysqld-base-version] as a default group for the mysqld server
...
Portability fix for Windows 64
2003-06-04 16:05:27 +03:00
venu@myvenu.com
94b570daf9
client.c:
...
Missed file from earlier commit
2003-06-04 00:21:49 -07:00
venu@myvenu.com
2e27ab2708
protocol test update
...
(fix for memory ovverun bug from DBD(ranger) + changes for removal of collation from explain)
2003-06-04 00:19:09 -07:00
venu@myvenu.com
c14de0f584
1. Portability fixups for Connector/ODBC 3.52 & DBD
...
(Addition of mysql_fetch_column & mysql_stmt_free_result)
2. Windows build fixups for libmysqld, mysqlbinlog and mysqldemb
2003-06-04 00:17:48 -07:00
venu@myvenu.com
99ceb8fd04
Windows build fixups (Fix for slave_net_timeout)
2003-06-03 22:57:42 -07:00
venu@myvenu.com
45fc8cc25b
Fix windows build after applyiing the changes from new client.c(sql-common)
...
NOTE: Still the build fails to compile core server on Windows due to slave_net_timeout linker error from client.obj
and make sure to have the next changeset, which fixes this.
2003-06-03 20:59:32 -07:00
venu@myvenu.com
8f57d0e2e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-06-03 18:45:53 -07:00
venu@myvenu.com
27469ec8b9
Windows build fixups with the latest source
2003-06-03 18:45:07 -07:00
guilhem@mysql.com
c172cab875
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-03 23:14:09 +02:00
guilhem@mysql.com
4a80a6c7b9
One-line fix for bug 576 (DBUG_ASSERT failure when using CHANGE MASTER TO RELAY_LOG_POS=4).
...
Plus a changeset which I had committed but forgot to push (and this changeset is lost on
another computer, so I recreate it here). This changeset is "user-friendly SHOW BINLOG EVENTS
and CHANGE MASTER TO when log positions < 4 are used.
2003-06-03 23:13:06 +02:00
guilhem@mysql.com
3b974039f7
-- Waiting for Monty's approval before push --
...
Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master:
if it was with IGNORE, do it with IGNORE,
if it was with REPLACE, do it with REPLACE,
and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
on the slave, i.e. a message where the keyname and key value appear :
'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'
2003-06-03 15:47:29 +02:00
bar@bar.mysql.r18.ru
514afa7a88
SPACE() is now ucs2 compatible
2003-06-03 18:24:57 +05:00
bar@bar.mysql.r18.ru
f696135c30
Collation & coercibility tests for LTRIM, RTRIM and TRIM
2003-06-03 17:13:19 +05:00
bar@bar.mysql.r18.ru
1ef8b2e34a
LTRIM, RTRIM and TRIM now honors coercibility
...
LTRIM, RTRIM and TRIM now work fine with ucs2
2003-06-03 16:57:14 +05:00
hf@deer.(none)
b175a26f44
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
2003-06-03 15:29:45 +05:00
hf@deer.(none)
5990e7c38e
Obsolete files removed
2003-06-03 15:27:17 +05:00