lars@mysql.com
7271a6014f
Merge 4.1->5.0
2005-02-22 22:40:34 +01:00
monty@mysql.com
e2ea35ec67
Merge with 4.1
2005-02-22 15:47:00 +02: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
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
lars@mysql.com
1d3c67000b
BUG#6662: Changes after Guilhems and Sergs review
2005-02-22 12:40:31 +01: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
lars@mysql.com
be28ef0a20
BUG#6662: Importing mysqldumps should not show any warnings of level "notes".
2005-02-21 18:40:28 +01:00
bar@mysql.com
e2bd15eca2
mysql.cc:
...
bug#7571:
Server & Client characterset are shown under different decriptions
Switch them into the correct order.
2005-02-21 15:43:25 +04:00
serg@serg.mylan
530eecbd99
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
serg@serg.mylan
2b41b8fa01
post-review fixes. Now ROLLBACK is done in Format_description_log_event
2005-02-17 13:52:16 +01:00
monty@mysql.com
410e51c854
Fixed failing test cases 'row.test' when running with --ps-protocol
...
Simple optimzations done while reviewing code
2005-02-15 16:45:00 +02:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
mats@mysql.com
6611d3d2f8
Merge mysql.com:/home/bkroot/mysql-5.0
...
into mysql.com:/home/bk/b7853-mysql-5.0
2005-02-10 19:15:53 +01:00
monty@mysql.com
a1a39fab84
Merge with 4.1
2005-02-10 02:27:37 +02:00
serg@serg.mylan
db13afd89d
auto-ROLLBACK if binlog was not closed properly
...
auto-commit on Xid_log_event
2005-02-09 20:04:28 +01:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb
Applied a patch for Netware.
2005-02-08 19:49:40 +02:00
jimw@mysql.com
8c8553af81
Merge changes
2005-02-04 11:59:02 -08:00
jimw@mysql.com
bd9239d4d7
Merge mysql.com:/home/jimw/my/mysql-4.1-8029
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-04 10:41:56 -08:00
mats@mysql.com
f6caefef2d
Bug#7853 (mysqlbinlog does not accept input from stdin)
...
The utility 'mysqlbinlog' now accepts input from stdin. It can
now be used to read the output from, e.g., 'zcat' or other utility.
2005-02-04 14:29:54 +01:00
guilhem@mysql.com
a85df46c01
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-03 18:55:29 +01:00
guilhem@mysql.com
ac053d80e9
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-03 16:25:57 +01:00
guilhem@mysql.com
ed1696f6b9
WL#1062 "log charset info into all Query_log_event":
...
we store 7 bytes (1 + 2*3) in every Query_log_event.
In the future if users want binlog optimized for small size and less safe,
we could add --binlog-no-charset (and binlog-no-sql-mode etc): charset info
is something by design optional (even if for now we don't offer possibility to disable it):
it's not a binlog format change.
We try to reduce the number of get_charset() calls in the slave SQL thread to a minimum
by caching the charset read from the previous event (which will often be equal to the one of the current event).
We don't use SET ONE_SHOT for charset-aware repl (we still do for timezones, will be fixed later).
No more errors if one changes the global value of charset vars on master or slave
(as we log charset info in all Query_log_event).
Not fixing Load_log_event as it will be rewritten soon by Dmitri.
Testing how mysqlbinlog behaves in rpl_charset.test.
mysqlbinlog needs to know where charset file is (to be able to convert a charset number found
in binlog (e.g. in User_var_log_event) to a charset name); mysql-test-run needs to pass
the correct value for this option to mysqlbinlog.
Many result udpates (adding charset info into every event shifts log_pos in SHOW BINLOG EVENTS).
Roughly the same job is to be done for timezones :)
2005-02-03 16:22:16 +01:00
monty@mysql.com
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
jimw@mysql.com
37edc3436e
Fix 'mysqlcheck --help' to not specify what storage engines are
...
supported, rather than give incorrect information. (Bug #8029 )
2005-02-02 15:03:34 -08:00
monty@mysql.com
e791e86444
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-02 20:30:57 +02:00
monty@mysql.com
b87e0c52a7
Proper fix for comparision with ' '
...
(Bug #7788 "Table is full" occurs during a multitable update")
2005-02-01 16:27:08 +02:00
jimw@mysql.com
458c221e0d
Add 'debug' to mysqladmin --help output. (Bug #8207 )
2005-01-31 19:35:12 -08:00
jimw@mysql.com
85a5c61c5d
Merge mysql.com:/home/jimw/my/mysql-4.1-7811
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-31 17:51:45 -08:00
jimw@mysql.com
b7dda3f7c0
Merge
2005-01-31 16:27:17 -08:00
jimw@mysql.com
b4caa3aad5
Merge mysql.com:/home/jimw/my/mysql-4.1-8148
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 15:28:33 -08:00
reggie@bob.(none)
f953ef56f9
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bob.(none):/home/reggie/bk/mysql5.0
2005-01-29 09:37:06 -06:00
reggie@bob.(none)
fc254d068f
Merge
2005-01-29 09:34:36 -06:00
reggie@bob.(none)
9af0b70d9e
Bug #5185 mysqldump for windows database gets table names with different case
...
mysqldump.c:
Trimmed some lines to be less than 80 chars. Using just NAME_LEN now for table name buffers
2005-01-29 09:25:56 -06:00
jimw@mysql.com
71670605ac
Use single quotes to set SQL_MODE in mysqldump output in case ANSI_QUOTES
...
was already defined on the server the dump is loaded into. (Bug #8148 )
2005-01-28 11:16:49 -08:00
serg@serg.mylan
852f2e0aba
small Makefile.am cleanup
...
clean: targets removed
generated *.h files moved to include/
2005-01-28 17:14:03 +01:00
reggie@bob.(none)
e9e4d936dc
Bug #5185 mysqldump for windows database gets table names with different case
...
Added the get_actual_table_name function that issues a SHOW TABLES LIKE '%s'. This will get the table
name in the proper case. We use this table name rather than the one given on the command line. This will
prevent problems when importing SQL on Linux that was generated on a Windows platform where case can be
an issue.
mysqldump.c:
call get_actual_table_name to get the table name in the proper case
2005-01-27 14:48:26 -06:00
serg@serg.mylan
160f254d34
merged
2005-01-26 09:54:12 +01:00
jimw@mysql.com
ec98b8f235
Change 'mysql' client to output XML like the 'mysqldump'
...
tool does, with the column names as attributes on <field>
elements, instead of trying to use the column name as the
element name. Also fix some encoding issues. (Bug #7811 )
2005-01-25 14:25:40 -08:00
serg@serg.mylan
76f3d6f002
merged
2005-01-25 21:11:04 +01:00
monty@mysql.com
37168015cd
Cleanups during review
2005-01-25 21:27:51 +02:00
jani@ua141d10.elisa.omakaista.fi
d5f76d50f6
Some bug fixes and a feature add to mysql-test-run
2005-01-25 18:32:09 +02:00
serg@serg.mylan
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
serg@serg.mylan
79240013b2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00
dlenev@brandersnatch.localdomain
e906e86121
After merge fix.
2005-01-18 22:24:22 +03:00
dlenev@mysql.com
5f21e5ac47
Merge mysql.com:/home/dlenev/src/mysql-4.1-merges
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-18 22:13:05 +03:00
jani@ua141d10.elisa.omakaista.fi
625ae2c5a0
Added possibility to use --error <name> instead of --error <number>
...
The old syntax works as well. WL#2356.
2005-01-18 20:16:21 +02:00
konstantin@mysql.com
0e56df7572
Cleanups in Makefile.ams
2005-01-18 17:26:04 +03:00
monty@mysql.com
502ba93b38
Merge with global tree
2005-01-18 04:03:26 +02:00
