Commits · 7ceda6b29193b456f351a4fda9b3c6338af97d30 · nexedi / MariaDB

05 Jun, 2005 1 commit
- a compiler must see '#pragma implementation' *before* · 7ceda6b2
  unknown authored Jun 05, 2005
```
'#pragma interface' (that comes with the #include'd header file)
```
  7ceda6b2
04 Jun, 2005 3 commits

Fix show warnings limit 0 and show warnings limit 0, 0. · 0d3de54b

unknown authored Jun 04, 2005

Add test coverage for SHOW WARNINGS LIMIT a, b;


mysql-test/r/warnings.result:
  Add test coverage for SHOW WARNINGS LIMIT a,b
mysql-test/t/warnings.test:
  Add test coverage for SHOW WARNINGS LIMIT a,b
sql/sql_error.cc:
  Fix show warnings limit 0 and show warnings limit 0, 0

0d3de54b

mergemerged · f853e971

unknown authored Jun 04, 2005


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

f853e971

after mergemerge · 785d3599
unknown authored Jun 04, 2005

785d3599

03 Jun, 2005 12 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 016a26bc
unknown authored Jun 03, 2005
```
into mysql.com:/home/my/mysql-4.1
```
016a26bc

Move USE_PRAGMA_IMPLEMENTATION to proper place · 90931c2e

unknown authored Jun 03, 2005

Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable


mysql-test/r/func_gconcat.result:
  Move innodb specific test to innodb.test
  Changed table name r2 -> t2
  More test to see how ROLLUP was optimized
mysql-test/r/innodb.result:
  Moved test here form func_gconcat
mysql-test/r/olap.result:
  New test results after optimization
mysql-test/t/func_gconcat.test:
  Move innodb specific test to innodb.test
  Changed table name r2 -> t2
  More test to see how ROLLUP was optimized
mysql-test/t/innodb.test:
  Moved test here form func_gconcat
sql/field.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_berkeley.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_blackhole.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_heap.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_innodb.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_isam.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_isammrg.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_myisam.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_myisammrg.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_ndbcluster.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/handler.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/hash_filo.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_cmpfunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_func.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
  Ensure that 'null_value' is not accessed before val() is called
sql/item_geofunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_strfunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_subselect.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_sum.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_timefunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_uniq.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/log_event.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/mysql_priv.h:
  Change key_map_full to not be const as we are giving it a proper value on startup
sql/mysqld.cc:
  Move key_map variables here and initialize key_map_full properly
sql/opt_range.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/opt_range.h:
  Fix that test_quick_select() works with any ammount of keys
sql/procedure.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/protocol.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/protocol_cursor.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/set_var.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_analyse.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_class.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_crypt.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_insert.cc:
  Fixed that max_rows is ulong
sql/sql_list.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_map.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_olap.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_select.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
  Fixed that ROLLUP don't have to always create a temporary table
  Added new argument to remove_const() to make above possible
  Fixed some errors that creapt up when we don't always do a temporary table for ROLLUP
sql/sql_string.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_table.cc:
  Simple optimizations
  Fixed wrong checking of build_table_path() in undef-ed code
sql/sql_udf.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_yacc.yy:
  removed extra {}

90931c2e

mergemerged · d8947762

unknown authored Jun 03, 2005


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

d8947762

after merge fixes · d7946bb3
unknown authored Jun 03, 2005

d7946bb3

merged · 2826245b

unknown authored Jun 03, 2005


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/create.result:
  merged, need fixing
sql/sql_parse.cc:
  merged (perhaps wrong)

2826245b

Merge bk-internal:/home/bk/mysql-4.0/ · cf0f4a63
unknown authored Jun 03, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
cf0f4a63
*don't* mess with kernel defines, boy. · 54f236d6
unknown authored Jun 03, 2005
```
and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure
```
54f236d6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 23093b08
unknown authored Jun 03, 2005
```
into mysql.com:/home/my/mysql-4.1
```
23093b08

check-cpu fixes/improvements (Bug #11065) · 4e56fcb2

unknown authored Jun 03, 2005

    
    - support additional platforms (OpenBSD, Darwin)
    - make use of /proc/cpuinfo CPU flag information
      (needed to distinguish EMT64 Xeons from normal ones)
    - chose the right CPU related options depending on 
      GCC version and target architecture
    - check if the chosen CPU type is actually supported
      by the GCC version , fallback to CPUs predecessor
      until test compile succeeds

4e56fcb2

sql_repl.cc: · 28c58b05

unknown authored Jun 03, 2005

  Bug #11064  	some read error not detected in replication on 64-bit platform


sql/sql_repl.cc:
  Bug #11064  	some read error not detected in replication on 64-bit platform
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

28c58b05

bundle the check-cpu helper script with source packages. · c8c71714
unknown authored Jun 03, 2005
```
BUG#10696
```
c8c71714

ctype_utf8.result, ctype_utf8.test: · d89397a8

unknown authored Jun 03, 2005

  adding test
field.cc:
  bug#10714 Inserting double value into utf8 column crashes server:
  sprintf was executed with too big length, which caused
  crash on some Windows platforms.


sql/field.cc:
  bug#10714 Inserting double value into utf8 column crashes server
  sprintf was executed with too long length, which cau
  crashe on Windows.
mysql-test/t/ctype_utf8.test:
  adding test
mysql-test/r/ctype_utf8.result:
  adding test

d89397a8

02 Jun, 2005 11 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b9c5554b
unknown authored Jun 03, 2005
```
into mysql.com:/home/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
```
b9c5554b
Removed duplicated and wrong merged code · 165f04cb
unknown authored Jun 03, 2005
```
sql/sql_base.cc:
  Fixed wrong comment
```
165f04cb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a370d165
unknown authored Jun 02, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/tmp
```
a370d165

CommandInterpreter.cpp: · 5eb57650

unknown authored Jun 02, 2005

Bug #11050 ndb_mgm "show" prints incorrectly after master data node fails

ndb/src/mgmclient/CommandInterpreter.cpp:
Bug #11050 ndb_mgm "show" prints incorrectly after master data node fails

5eb57650

fixed compile problem by replacing W_OK with F_OK · 1887e42d
unknown authored Jun 02, 2005
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
1887e42d

item_func.cc: · 2bf8c6c9

unknown authored Jun 02, 2005

set_var.cc:
variables.result
variables.test

  Bug #10904 Illegal mix of collations between a system variable and a constant
  Changing coercibility of system variables to SYSCONST,
  to be the same with USER(), DATABASE(), etc.


sql/item_func.cc:
  Bug #10904 Illegal mix of collations between a system variable and a constant
  Changing coercibility of system variables to SYSCONST
  To be the same with USER(), DATABASE(), etc.

2bf8c6c9

Merge mysql.com:/home/mydev/mysql-4.1 · 1968e8ee
unknown authored Jun 02, 2005
```
into mysql.com:/home/mydev/mysql-4.1-4100
```
1968e8ee

Merge · aefdd29e

unknown authored Jun 01, 2005


sql/ha_heap.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_repl.cc:
  SCCS merged

aefdd29e

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · dede1d4c
unknown authored Jun 02, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


sql/item_func.cc:
  Auto merged
```
dede1d4c

tztime.cc: · 504d71aa

unknown authored Jun 02, 2005

  Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION


client/sql_string.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
mysys/raid.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/field.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_berkeley.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_blackhole.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_heap.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_innodb.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_isam.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_isammrg.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_myisam.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_myisammrg.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_ndbcluster.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/handler.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/hash_filo.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_cmpfunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_func.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_geofunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_strfunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_subselect.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_sum.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_timefunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_uniq.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/log_event.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/opt_range.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/procedure.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/protocol.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/protocol_cursor.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/set_var.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_analyse.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_class.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_crypt.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_list.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_map.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_olap.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/examples/ha_archive.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_select.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_string.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_udf.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/examples/ha_example.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/examples/ha_tina.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/tztime.cc:
  Set #pragma implementation" earlier

504d71aa

Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed... · 7566990d

unknown authored Jun 01, 2005

Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.


client/mysqladmin.cc:
  gcc 4.0 fix
sql/examples/ha_archive.cc:
  Bunch of little cleanups from -Wall and gcc 4.0 fixes
sql/examples/ha_example.cc:
  Noticed that the error call was not quite right.
sql/examples/ha_tina.cc:
  Bunch of cleanups (many of which were quite dumb of me... and I have no earthly idea how they missed everyone's notice).
sql/ha_heap.cc:
  Removed unused variable (-Wall find)
sql/item_subselect.cc:
  Removed unused label.
sql/mysqld.cc:
  Cleanup of unused function and gcc 4.0 bit.
sql/opt_range.h:
  Cleanup for gcc 4.0
sql/repl_failsafe.cc:
  Cleanup for gcc 4.0
sql/slave.cc:
  Cleanup for gcc 4.0
sql/sql_acl.cc:
  Cleanup for gcc 4.0
sql/sql_insert.cc:
  Cleanedup for gcc 4.0
sql/sql_parse.cc:
  Cleanedup for gcc 4.0
sql/sql_repl.cc:
  Removed unused variable
sql/sql_select.cc:
  Cleanedup for gcc 4.0

7566990d

01 Jun, 2005 13 commits

Fix --with-bdb to be --with-berkeley-db in BUILD/SETUP.sh · c146c495
unknown authored Jun 01, 2005
```
BUILD/SETUP.sh:
  Fix --with-bdb to --with-berkeley-db
```
c146c495
Fix compile error when HAVE_BERKELEY_DB · 0eb7be3a
unknown authored Jun 01, 2005
```
sql/sql_table.cc:
  Add missing argument
```
0eb7be3a
Update results of test after merge of bugfix · 362ab06c
unknown authored Jun 01, 2005
```
mysql-test/r/rpl_failed_optimize.result:
  Update results
```
362ab06c
Merge mysql.com:/home/jimw/my/mysql-4.1-8572 · 8d5c88c3
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
8d5c88c3
Merge mysql.com:/home/jimw/my/mysql-4.1-9660 · 73ecad9c
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
```
73ecad9c
Merge mysql.com:/home/jimw/my/mysql-4.1-10944 · 7e1dfcdf
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
7e1dfcdf
Merge mysql.com:/home/jimw/my/mysql-4.1-8135 · 3543c49f
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
```
3543c49f

Fix handling of NULL fields in FIELD(). (Bug #10944) · b3958861

unknown authored Jun 01, 2005


mysql-test/r/func_str.result:
  Update results
mysql-test/t/func_str.test:
  Add regression tests
sql/item_func.cc:
  Handle NULL as first argument to FIELD()

b3958861

Merge mysql.com:/home/mydev/mysql-4.1 · c132e64f
unknown authored Jun 01, 2005
```
into mysql.com:/home/mydev/mysql-4.1-4100
```
c132e64f

Bug#10602 - LOAD INDEX INTO CACHE deadlocks · 606254c9

unknown authored Jun 01, 2005

Fixed two deadlocks.
Made minor changes.


mysys/mf_keycache.c:
  Bug#10602 - LOAD INDEX INTO CACHE deadlocks
  Fixed two deadlocks.
  Made keycache traces line buffered.
  Removed unused macro and function.
  Added comments and trace messages.
  Fixed two compiler warnings.
  Fixed some coding style issues.

606254c9

Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 · c12d5643
unknown authored Jun 01, 2005
```
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
```
c12d5643

- removed references to some obsolete files (BUG#10824) · 3a192cf5

unknown authored Jun 01, 2005

- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)


BitKeeper/deleted/.del-mysql-max.spec.sh~ca055d86585c1010:
  Delete: support-files/mysql-max.spec.sh
configure.in:
  - removed references to some obsolete files
scripts/make_binary_distribution.sh:
  - removed references to some obsolete files

3a192cf5

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 13fd2454
unknown authored Jun 01, 2005
```
into mysql.com:/space/my/mysql-4.1
```
13fd2454