Commit graph

31092 commits

Author SHA1 Message Date
bar@myoffice.izhnet.ru
eec0355de2 func_str.result, func_str.test:
Adding test case.
item_strfunc.cc:
  bug#11728 string function LEFT, strange undocumented behaviour
  Fixing LEFT and RIGHT return NULL if the second
  argument is NULL.
2006-07-07 17:06:30 +05:00
bar@mysql.com
a8844cb22a Merge mysql.com:/usr/home/bar/mysql-4.1.b7192
into  mysql.com:/usr/home/bar/mysql-5.0-kt
2006-07-07 16:27:38 +05:00
tomas@poseidon.ndb.mysql.com
8b57568a5f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-05 16:40:24 +02:00
tomas@poseidon.ndb.mysql.com
a0ab5ae09f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-05 16:34:34 +02:00
tomas@poseidon.ndb.mysql.com
04ae971576 Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
- remove some event code to get rid of some bugs
2006-07-05 16:26:08 +02:00
knielsen@mysql.com
ff0041e8a6 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/data0/knielsen/tmp-5.0
2006-07-04 19:10:08 +02:00
jonas@mc01.ndb.mysql.com
d0146162e5 ndb - ps_7ndb as discovered by pb
fix race in scan close
2006-07-04 16:54:07 +02:00
knielsen@mysql.com
7892dca173 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/data0/knielsen/tmp-5.0
2006-07-04 14:10:53 +02:00
jonas@perch.ndb.mysql.com
795eafbce3 Merge tomas@poseidon:mysql-5.0-main
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-07-04 12:47:08 +02:00
tomas@poseidon.ndb.mysql.com
0b2024ac88 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-04 12:47:07 +02:00
knielsen@rt.int.sifira.dk
7062993817 Merge mysqldev@production:my/mysql-5.0-release
into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.0
2006-07-04 12:08:58 +02:00
tomas@poseidon.ndb.mysql.com
1e4ccec835 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-release
2006-07-04 12:08:57 +02:00
tomas@poseidon.ndb.mysql.com
98874725e0 Bug #20784 Uninitialized memory in update on table with PK not on first column
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
2006-07-04 11:43:06 +02:00
jonas@perch.ndb.mysql.com
5e68b4ab68 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-07-04 09:56:27 +02:00
tomas@poseidon.ndb.mysql.com
904100ee73 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-03 22:58:10 +02:00
tnurnberg@mysql.com
b3e368df19 Bug#20783: Valgrind uninitialised warning in test case ctype_uca
Two functions have different ideas of what a string should look like;
one of them reads memory it assumes the other one may have written.
And "if you assume ..."
  
We now use a more defensive variety of the assuming function, this fixes
a warning thrown by the valgrind tool.
2006-07-03 21:41:15 +02:00
kent@mysql.com
caa3fcf673 client.c:
Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
2006-07-03 20:08:38 +02:00
kent@mysql.com
4b6878e4b0 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2006-07-03 19:53:57 +02:00
kent@suse9-x86.mysql.com
7455f8a31f mwldnlm, mwccnlm, mwasmnlm:
Use Perl for filtering, do more filtering
2006-07-03 16:44:17 +02:00
kent@suse9-x86.mysql.com
6b08a98644 Makefile.am:
Avoid duplicate symbol errors on Netware
mwldnlm, mwccnlm, mwasmnlm:
  Filter garbage characters from output
2006-07-03 10:56:19 +02:00
gluh@mysql.com
d2b378d57f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
2006-07-03 13:19:18 +05:00
kent@mysql.com
eba43438b9 mysqld.vcproj:
Don't define __NT__ for 'Max' target
2006-07-01 23:52:19 +02:00
konstantin@mysql.com
1c4dffc8ca Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime
2006-07-01 22:13:42 +04:00
kent@mysql.com
06b4c9abbb my_sys.h:
Added missing parameter type change for _my_strdup_with_length()
2006-07-01 15:11:59 +02:00
sergefp@mysql.com
775ec4fb85 Post-merge fix 2006-07-01 09:28:41 +04:00
sergefp@mysql.com
f863685241 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/psergey/mysql-5.0-bug16168-merge
2006-07-01 07:04:27 +04:00
sergefp@mysql.com
784b3118a5 Merge mysql.com:/home/psergey/mysql-4.1-bug16168-push
into  mysql.com:/home/psergey/mysql-5.0-bug16168-merge
2006-07-01 01:25:59 +04:00
konstantin@mysql.com
fbeb42a9e1 Remove an unused variable. 2006-07-01 00:33:47 +04:00
konstantin@mysql.com
41fea3d763 Remove a couple of unused/barely used names. 2006-07-01 00:14:28 +04:00
joerg@mysql.com
34d5c36c2b Manual transfer of the following changeset into the 5.0.23 release clone:
1.2525 06/06/30 18:29:27 monty@mysql.com +3 -0
   Reverted wrong bug fix (Bug#11228)
2006-06-30 19:37:11 +02:00
monty@mysql.com
f62829636b After merge fixes 2006-06-30 20:07:33 +03:00
monty@mysql.com
2f86009c9e Merge mysql.com:/home/my/mysql-4.1
into  mysql.com:/home/my/mysql-5.0
2006-06-30 19:15:18 +03:00
monty@mysql.com
445dfdc3a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2006-06-30 19:15:17 +03:00
tomas@poseidon.ndb.mysql.com
805551ead3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-30 18:15:16 +02:00
monty@mysql.com
2bec1b86bb Reverted wrong bug fix (Bug#11228) 2006-06-30 18:29:27 +03:00
tomas@poseidon.ndb.mysql.com
1e9897013a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-30 16:34:19 +02:00
tomas@poseidon.ndb.mysql.com
58c45c3e6c Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-30 16:30:41 +02:00
tomas@poseidon.ndb.mysql.com
c8b65bb357 manual merge, patch only relevant for 4.1 2006-06-30 16:29:17 +02:00
tomas@poseidon.ndb.mysql.com
e61bfafaa9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-30 16:26:33 +02:00
tomas@poseidon.ndb.mysql.com
9f542ef0f4 adopted ndb handler code for tables without primary key and with unique index
- added missing retrieval of hidden primary key
2006-06-30 16:25:07 +02:00
kroki@mysql.com
96bddcafe7 Bug#17226: Variable set in cursor on first iteration is assigned
second iterations value

During assignment to the BLOB variable in routine body the value
wasn't copied.
2006-06-30 18:14:22 +04:00
bar@mysql.com
d1c2454815 Bug#7192 Specify --with-collation doesn't work for connections?
--with-collation worked only on the server side.
Client side ignored this argument, so collation_connection
was not properly set (remained latin1_swedish_ci).
2006-06-30 16:48:18 +05:00
jonas@perch.ndb.mysql.com
b4ecd41e2e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-06-30 11:25:37 +02:00
jonas@perch.ndb.mysql.com
692cebf793 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-06-30 11:17:24 +02:00
knielsen@mysql.com
a5f362cb94 Merge mysqldev@production:my/mysql-5.0-release
into  mysql.com:/usr/local/mysql/tmp-5.0
2006-06-30 11:11:49 +02:00
knielsen@mysql.com
a3019ab196 Fix Windows build problem following previous push. 2006-06-30 11:10:38 +02:00
kroki@mysql.com
69f0e87b05 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug20152
2006-06-30 12:54:11 +04:00
kroki@mysql.com
79ca4c1d55 bug #20152: mysql_stmt_execute() overwrites parameter buffers
When using a parameter bind MYSQL_TYPE_DATE in a prepared statement,
the time part of the MYSQL_TIME buffer was written to zero in
mysql_stmt_execute(). The param_store_date() function in libmysql.c
worked directly on the provided buffer.
Changed to use a copy of the buffer.
2006-06-30 12:52:05 +04:00
jonas@perch.ndb.mysql.com
a4bfd31865 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-06-30 09:42:15 +02:00
jonas@perch.ndb.mysql.com
ab3992771b ndb - bug#20774
crash if system restart with more than 4096 fragments
  solution: continueb enable expand check loop
2006-06-30 09:41:41 +02:00