Commit graph

17761 commits

Author SHA1 Message Date
joreland@mysql.com
72127b52b3 BUG#8786 - ndb_autodiscover, post review
More explicit naming of variables
2005-02-25 09:10:35 +01:00
joreland@mysql.com
c25ce0e362 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 18:59:56 +01:00
joreland@mysql.com
15de06f290 bug#8786 - ndb autodiscover, sometimes fails
remove dict forwarding
  add api retries on NotMaster
2005-02-24 18:58:56 +01:00
lars@mysql.com
c99c44805c Fix of an incorrect merge 2005-02-24 17:25:06 +01:00
mwagner@here.mwagner.org
cbc8b5c3c8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
2005-02-23 23:57:28 -06:00
mwagner@here.mwagner.org
27efaa9127 Bootstrap:
Add new manual.texi include files
2005-02-23 23:44:13 -06:00
joreland@mysql.com
87402eb5bb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 06:14:43 +01:00
jimw@mysql.com
3ecabaa9f7 Don't try to create a symlink if the DATA DIRECTORY specified for a table
is the same as the normal datadir for that database. (Bug #8707)
2005-02-23 13:59:04 -08:00
mats@mysql.com
30ade5b57e Bug#8412: Setting error code to 0 on statements that cannot fail. 2005-02-23 20:59:00 +01:00
mats@mysql.com
6ad51ffb3c Bug#8412: Merge from 4.0 2005-02-23 19:58:54 +01:00
mats@mysql.com
a4cdb93b38 Merge mysql.com:/home/bkroot/mysql-4.0
into mysql.com:/home/bk/b8412-mysql-4.0
2005-02-23 19:40:31 +01:00
guilhem@mysql.com
772b1cedcd Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-23 18:18:22 +01:00
gluh@gluh.mysql.r18.ru
fc9c20995f Fix for bug #6572: SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
guilhem@mysql.com
086c2a915a FIx for BUG#8682 "flush_block_commit test hangs on HPUX":
start_waiting_global_read_lock() should wake up all those who are waiting
for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
AND those registered in global_read_lock_blocks_commit.
2005-02-23 17:38:51 +01:00
gluh@gluh.mysql.r18.ru
2b5ee94a33 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03:00
bar@mysql.com
4996daec19 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-02-23 16:29:01 +04:00
bar@mysql.com
99937c2b91 config-win.h:
Activate Unicode collations in Windows version.
2005-02-23 16:28:10 +04:00
tomas@poseidon.ndb.mysql.com
ce6ffc3dcc removed printout "- Repeated 1 times"
make sure transporter connections are close early in shutdown
2005-02-23 10:12:26 +01:00
jimw@mysql.com
a50be4d42b Merge mysql.com:/home/jimw/my/mysql-4.1-7989
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:15:34 -08:00
jimw@mysql.com
df3c8db4f3 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00
heikki@hundin.mysql.fi
5f427ec35d row0sel.c:
Fix bug #8677: if one used LOCK TABLES, created an InnoDB temp table, and did a multi-table update where a MyISAM table was the update table and the temp table was a read table, then InnoDB aserted in row0sel.c because n_mysql_tables_in_use was 0. Also, we remove the assertion altogether and just print an error to the .err log if this important consistency check fails. Then it is up to the user to read the .err log and notice the problem if there still are errors in MySQL's table locking.
2005-02-22 21:05:17 +02:00
lars@mysql.com
c583eb6954 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 14:17:17 +01:00
lars@mysql.com
6b06ff5956 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
2005-02-22 14:12:42 +01:00
lars@mysql.com
d59fa45596 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 14:12:23 +01:00
monty@mysql.com
5e6ba9dec8 Fix errors in my last changeset 2005-02-22 15:08:12 +02:00
lars@mysql.com
f09466e0d7 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b8297-4.1 2005-02-22 14:03:01 +01:00
monty@mysql.com
7914e24409 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-22 14:43:14 +02:00
lars@mysql.com
e31ea39d0c Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:39:41 +01:00
bar@mysql.com
5ef265f219 Bug#8349 myisamchk: --set-charset does not work
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message.
2005-02-22 16:37:25 +04:00
bell@51.0.168.192.in-addr.arpa
babcdb6407 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 14:34:59 +02:00
lars@mysql.com
d2ecf8e6a5 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:29:20 +01:00
lars@mysql.com
2d1089e8c1 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1 2005-02-22 13:22:34 +01:00
bar@mysql.com
89a5530822 A user variable are now always have IMPLICIT coercibility,
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with 
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.
2005-02-22 15:55:40 +04:00
lars@mysql.com
1d3c67000b BUG#6662: Changes after Guilhems and Sergs review 2005-02-22 12:40:31 +01:00
joreland@mysql.com
c0f4bc1393 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-22 12:15:56 +01:00
joreland@mysql.com
06b4b99932 wl1292 - ndb autotest - fix html reporting bug 2005-02-22 12:15:27 +01:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 13:00:00 +02:00
monty@mysql.com
22a76c1dfb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-22 12:51:54 +02:00
monty@mysql.com
e2dc9b4099 Backport my_strntod() from 5.0
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)
2005-02-22 12:51:23 +02:00
joreland@mysql.com
a17ace8104 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-22 10:20:35 +01:00
joreland@mysql.com
df22808b02 wl1292 - ndb autotest scripts
split into script/conf for easier deployment
2005-02-22 10:18:38 +01:00
joreland@mysql.com
414e1c6799 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-22 08:21:24 +01:00
bar@mysql.com
c0230f6f5f ctype_latin1.result, ctype_latin1.test, charset.c:
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04:00
bar@mysql.com
c709ad87db field.cc:
optimize test_if_minus() when not UCS2 support is compiled.
2005-02-22 08:35:15 +04:00
paul@snake-hub.snake.net
97f18ad1e0 Merge. 2005-02-21 17:28:33 -06:00
lars@mysql.com
be28ef0a20 BUG#6662: Importing mysqldumps should not show any warnings of level "notes". 2005-02-21 18:40:28 +01:00
lars@mysql.com
d857155e1d BUG#6676: Added comment for the fix 2005-02-21 17:52:15 +01:00
lars@mysql.com
5cffeb2b85 BUG#6676: Derivation of user variables should be of derivation "IMPLICIT" 2005-02-21 16:26:04 +01:00
paul@snake-hub.snake.net
a32790ca05 sql_parse.cc:
Fix compiler complaint.
2005-02-21 09:15:43 -06:00
konstantin@mysql.com
b902a66e27 Fix -ansi -pedantic compilation failure. 2005-02-21 17:27:36 +03:00